To3.10

bonobo/_version.py

@@ -1 +1 @@
-__version__ = '0.7.0rc2'
+__version__ = '0.7.0_310'

bonobo/config/processors.py

@@ -1,4 +1,7 @@
-from collections.abc import Iterable
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 from contextlib import contextmanager
 from functools import partial
 from inspect import signature

bonobo/util/collections.py

@@ -1,6 +1,9 @@
 import bisect
 import functools
-from collections import Sequence
+try:
+    from collections.abc import Sequence
+except ImportError:
+    from collections import Sequence
 
 
 class sortedlist(list):

bonobo/util/testing.py

@@ -163,7 +163,7 @@ def run_environ(self, runner, *args, environ=None):
                 assert os.environ["PATH"] == _environ["PATH"]
 
         assert err == ""
-        return dict(map(lambda line: line.split(" ", 1), filter(None, out.split("\n"))))
+        return dict(filter(None, map(lambda line: line.strip().split(" ", 1) if " " in line.strip() else None, out.split("\n"))))
 
 
 class StaticNodeTest:

requirements-dev.txt

@@ -1,44 +1,3 @@
--e .[dev]
 -r requirements.txt
-alabaster==0.7.12
-arrow==0.14.2
-atomicwrites==1.3.0
-attrs==19.1.0
-babel==2.7.0
-binaryornot==0.4.4
-certifi==2019.6.16
-chardet==3.0.4
-click==7.0
-cookiecutter==1.5.1
-coverage==4.5.3
-docutils==0.14
-future==0.17.1
-idna==2.8
-imagesize==1.1.0
-importlib-metadata==0.18
-jinja2-time==0.2.0
-jinja2==2.10.1
-markupsafe==1.1.1
-more-itertools==7.1.0
-packaging==19.0
-pathlib2==2.3.4
-pluggy==0.12.0
-poyo==0.4.2
-py==1.8.0
-pygments==2.4.2
-pyparsing==2.4.0
-pytest-cov==2.7.1
-pytest-timeout==1.3.3
-pytest==4.6.4
-python-dateutil==2.8.0
-pytz==2019.1
-requests==2.22.0
-six==1.12.0
-snowballstemmer==1.9.0
-sphinx-sitemap==0.2
-sphinx==1.8.5
-sphinxcontrib-websupport==1.1.2
-urllib3==1.25.3
-wcwidth==0.1.7
-whichcraft==0.6.0
-zipp==0.5.2
+pytest-timeout
+ipython

requirements-docker.txt

@@ -1,30 +1,2 @@
 -e .[docker]
 -r requirements.txt
-appdirs==1.4.3
-bonobo-docker==0.6.0
-certifi==2019.6.16
-chardet==3.0.4
-colorama==0.3.9
-docker-pycreds==0.4.0
-docker==2.7.0
-fs==2.4.8
-graphviz==0.8.4
-idna==2.8
-jinja2==2.10.1
-markupsafe==1.1.1
-mondrian==0.8.0
-packaging==19.0
-pbr==5.4.1
-psutil==5.6.3
-pyparsing==2.4.0
-python-slugify==1.2.6
-pytz==2019.1
-requests==2.22.0
-semantic-version==2.6.0
-six==1.12.0
-stevedore==1.30.1
-typing==3.7.4
-unidecode==1.1.1
-urllib3==1.25.3
-websocket-client==0.56.0
-whistle==1.0.1

requirements-jupyter.txt

@@ -1,46 +1,2 @@
 -e .[jupyter]
 -r requirements.txt
-appnope==0.1.0
-attrs==19.1.0
-backcall==0.1.0
-bleach==3.1.0
-decorator==4.4.0
-defusedxml==0.6.0
-entrypoints==0.3
-ipykernel==5.1.1
-ipython-genutils==0.2.0
-ipython==7.6.1
-ipywidgets==6.0.1
-jedi==0.14.1
-jinja2==2.10.1
-jsonschema==3.0.1
-jupyter-client==5.3.1
-jupyter-console==6.0.0
-jupyter-core==4.5.0
-jupyter==1.0.0
-markupsafe==1.1.1
-mistune==0.8.4
-nbconvert==5.5.0
-nbformat==4.4.0
-notebook==6.0.0
-pandocfilters==1.4.2
-parso==0.5.1
-pexpect==4.7.0
-pickleshare==0.7.5
-prometheus-client==0.7.1
-prompt-toolkit==2.0.9
-ptyprocess==0.6.0
-pygments==2.4.2
-pyrsistent==0.15.3
-python-dateutil==2.8.0
-pyzmq==18.0.2
-qtconsole==4.5.1
-send2trash==1.5.0
-six==1.12.0
-terminado==0.8.2
-testpath==0.4.2
-tornado==6.0.3
-traitlets==4.3.2
-wcwidth==0.1.7
-webencodings==0.5.1
-widgetsnbextension==2.0.1

requirements-sqlalchemy.txt

@@ -1,27 +1,2 @@
 -e .[sqlalchemy]
 -r requirements.txt
-appdirs==1.4.3
-bonobo-sqlalchemy==0.6.0
-certifi==2019.6.16
-chardet==3.0.4
-colorama==0.3.9
-fs==2.4.8
-graphviz==0.8.4
-idna==2.8
-jinja2==2.10.1
-markupsafe==1.1.1
-mondrian==0.8.0
-packaging==19.0
-pbr==5.4.1
-psutil==5.6.3
-pyparsing==2.4.0
-python-slugify==1.2.6
-pytz==2019.1
-requests==2.22.0
-six==1.12.0
-sqlalchemy==1.3.5
-stevedore==1.30.1
-typing==3.7.4
-unidecode==1.1.1
-urllib3==1.25.3
-whistle==1.0.1

requirements.txt

@@ -1,25 +1,2 @@
 -e .
-appdirs==1.4.3
-cached-property==1.5.1
-certifi==2019.6.16
-chardet==3.0.4
-colorama==0.3.9
-fs==2.4.8
-graphviz==0.8.4
-idna==2.8
-jinja2==2.10.1
-markupsafe==1.1.1
-mondrian==0.8.0
-packaging==19.0
-pbr==5.4.1
-psutil==5.6.3
-pyparsing==2.4.0
-python-slugify==1.2.6
-pytz==2019.1
-requests==2.22.0
-six==1.12.0
-stevedore==1.30.1
-typing==3.7.4
-unidecode==1.1.1
-urllib3==1.25.3
-whistle==1.0.1
+markupsafe==2.0.1

setup.py

@@ -64,7 +64,7 @@ def execfile(fname, globs, locs=None):
         'cached-property ~= 1.4', 'fs ~= 2.0', 'graphviz >= 0.8, < 0.9',
         'jinja2 ~= 2.9', 'mondrian ~= 0.8', 'packaging ~= 19.0',
         'psutil ~= 5.4', 'python-slugify ~= 1.2.0', 'requests ~= 2.0',
-        'stevedore ~= 1.27', 'whistle ~= 1.0'
+        'stevedore ~= 1.27', 'whistle ~= 1.0', 'markupsafe==2.0.1'
     ],
     extras_require={
         'dev': [

tests/commands/test_run_environ.py

@@ -19,6 +19,7 @@ def env2(tmpdir):
 
 class TestDefaultEnvFile(EnvironmentTestCase):
     def test_run_with_default_env_file(self, runner, target, env1):
+        print(f"{self} {runner} {target} {env1}")
         env = self.run_environ(runner, *target, "--default-env-file", env1)
         assert env.get("SECRET") == "unknown"
         assert env.get("PASSWORD") == "sweet"