Merge pull request #197 from hartym/master

Maintenance.

Makefile

@@ -1,7 +1,5 @@
-# This file has been auto-generated.
+# This file has been auto-generated by Medikit. All changes will be lost.
-# All changes will be lost, see Projectfile.
+# Updated on 2017-10-21.
-#
-# Updated at 2017-10-05 18:56:33.985014
 
 PACKAGE ?= bonobo
 PYTHON ?= $(shell which python)
@@ -22,7 +20,7 @@ YAPF ?= $(PYTHON) -m yapf
 YAPF_OPTIONS ?= -rip
 VERSION ?= $(shell git describe 2>/dev/null || echo dev)
 
-.PHONY: $(SPHINX_SOURCEDIR) clean format install install-dev test
+.PHONY: $(SPHINX_SOURCEDIR) clean format install install-dev test update update-requirements
 
 # Installs the local project dependencies.
 install:
@@ -40,6 +38,16 @@ install-dev:
 clean:
 	rm -rf build dist *.egg-info
 
+# Update project artifacts using medikit, after installing it eventually.
+update:
+	python -c 'import medikit; print(medikit.__version__)' || pip install medikit;
+	$(PYTHON) -m medikit update
+
+# Remove requirements files and update project artifacts using medikit, after installing it eventually.
+update-requirements:
+	rm -rf requirements*.txt
+	$(MAKE) update
+
 test: install-dev
 	$(PYTEST) $(PYTEST_OPTIONS) tests
 

Projectfile

@@ -1,6 +1,6 @@
-# bonobo (see github.com/python-edgy/project)
+# bonobo's description for medikit
 
-from edgy.project import require
+from medikit import require
 
 pytest = require('pytest')
 python = require('python')

bonobo/config/options.py

@@ -53,21 +53,23 @@ class Option:
 
     _creation_counter = 0
 
-    def __init__(self, type=None, *, required=True, positional=False, default=None):
+    def __init__(self, type=None, *, required=True, positional=False, default=None, __doc__=None):
         self.name = None
         self.type = type
         self.required = required if default is None else False
         self.positional = positional
         self.default = default
 
+        self.__doc__ = __doc__ or self.__doc__
+
         # This hack is necessary for python3.5
         self._creation_counter = Option._creation_counter
         Option._creation_counter += 1
 
-    def __get__(self, inst, typ):
+    def __get__(self, inst, type_):
         # XXX If we call this on the type, then either return overriden value or ... ???
         if inst is None:
-            return vars(type).get(self.name, self)
+            return vars(type_).get(self.name, self)
 
         if not self.name in inst._options_values:
             inst._options_values[self.name] = self.get_default()

bonobo/config/services.py

@@ -49,8 +49,8 @@ class Service(Option):
     
     """
 
-    def __init__(self, name):
+    def __init__(self, name, __doc__=None):
-        super().__init__(str, required=False, default=name)
+        super().__init__(str, required=False, default=name, __doc__=__doc__)
 
     def __set__(self, inst, value):
         inst._options_values[self.name] = validate_service_name(value)

requirements-docker.txt

@@ -1,16 +1,16 @@
 -e .[docker]
 appdirs==1.4.3
-bonobo-docker==0.2.11
+bonobo-docker==0.2.12
 certifi==2017.7.27.1
 chardet==3.0.4
 colorama==0.3.9
 docker-pycreds==0.2.1
 docker==2.3.0
-fs==2.0.11
+fs==2.0.12
 idna==2.6
 packaging==16.8
 pbr==3.1.1
-psutil==5.3.1
+psutil==5.4.0
 pyparsing==2.2.0
 pytz==2017.2
 requests==2.18.4

requirements-jupyter.txt

@@ -19,7 +19,7 @@ markupsafe==1.0
 mistune==0.7.4
 nbconvert==5.3.1
 nbformat==4.4.0
-notebook==5.1.0
+notebook==5.2.0
 pandocfilters==1.4.2
 parso==0.1.0
 pexpect==4.2.1

requirements.txt

@@ -3,11 +3,11 @@ appdirs==1.4.3
 certifi==2017.7.27.1
 chardet==3.0.4
 colorama==0.3.9
-fs==2.0.11
+fs==2.0.12
 idna==2.6
 packaging==16.8
 pbr==3.1.1
-psutil==5.3.1
+psutil==5.4.0
 pyparsing==2.2.0
 pytz==2017.2
 requests==2.18.4

setup.py

@@ -1,4 +1,4 @@
-# This file is autogenerated by edgy.project code generator.
+# This file is autogenerated by medikit code generator.
 # All changes will be overwritten.
 
 from setuptools import setup, find_packages