diff options
| -rw-r--r-- | requirements.txt | 16 | ||||
| -rw-r--r-- | setup.cfg | 8 | ||||
| -rw-r--r-- | taskflow/conductors/backends/impl_executor.py | 4 | ||||
| -rwxr-xr-x | tools/subunit_trace.py | 2 |
4 files changed, 14 insertions, 16 deletions
diff --git a/requirements.txt b/requirements.txt index fc2a04d..cdf3b65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,16 +11,16 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 six>=1.9.0 # MIT # Enum library made for <= python 3.3 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD +enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD # For async and/or periodic work -futurist!=0.15.0,>=0.11.0 # Apache-2.0 +futurist>=1.2.0 # Apache-2.0 # For reader/writer + interprocess locks. fasteners>=0.7.0 # Apache-2.0 # Very nice graph library -networkx>=1.10 # BSD +networkx<2.0,>=1.10 # BSD # For contextlib new additions/compatibility for <= python 3.3 contextlib2>=0.4.0 # PSF License @@ -32,18 +32,18 @@ stevedore>=1.20.0 # Apache-2.0 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD # Used for structured input validation -jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT +jsonschema<3.0.0,>=2.6.0 # MIT # For the state machine we run with -automaton>=0.5.0 # Apache-2.0 +automaton>=1.9.0 # Apache-2.0 # For common utilities -oslo.utils>=3.20.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0 +oslo.utils>=3.28.0 # Apache-2.0 +oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 tenacity>=3.2.1 # Apache-2.0 # For lru caches and such -cachetools>=1.1.0 # MIT License +cachetools>=2.0.0 # MIT License # For deprecation of things debtcollector>=1.2.0 # Apache-2.0 @@ -68,13 +68,13 @@ eventlet = eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT doc = sphinx>=1.6.2 # BSD - openstackdocstheme>=1.16.0 # Apache-2.0 + openstackdocstheme>=1.17.0 # Apache-2.0 database = SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT alembic>=0.8.10 # MIT - SQLAlchemy-Utils # BSD License + SQLAlchemy-Utils>=0.30.11 # BSD License PyMySQL>=0.7.6 # MIT License - psycopg2>=2.5 # LGPL/ZPL + psycopg2>=2.6.2 # LGPL/ZPL test = pydotplus>=2.0.2 # MIT License hacking<0.11,>=0.10.0 @@ -82,7 +82,7 @@ test = mock>=2.0.0 # BSD testtools>=1.4.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD - doc8 # Apache-2.0 + doc8>=0.6.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 [nosetests] diff --git a/taskflow/conductors/backends/impl_executor.py b/taskflow/conductors/backends/impl_executor.py index 37d7774..2dc2ddd 100644 --- a/taskflow/conductors/backends/impl_executor.py +++ b/taskflow/conductors/backends/impl_executor.py @@ -22,7 +22,6 @@ try: except ImportError: from contextlib2 import ExitStack # noqa -from debtcollector import removals from oslo_utils import excutils from oslo_utils import timeutils import six @@ -129,8 +128,7 @@ class ExecutorConductor(base.Conductor): raise excp.NotImplementedError("This method must be implemented but" " it has not been") - @removals.removed_kwarg('timeout', version="0.8", removal_version="2.0") - def stop(self, timeout=None): + def stop(self): """Requests the conductor to stop dispatching. This method can be used to request that a conductor stop its diff --git a/tools/subunit_trace.py b/tools/subunit_trace.py index 9265efa..2bbb28e 100755 --- a/tools/subunit_trace.py +++ b/tools/subunit_trace.py @@ -90,7 +90,7 @@ def cleanup_test_name(name, strip_tags=True, strip_scenarios=False): Make it possible to strip out the testscenarios information (not to be confused with tempest scenarios) however that's often needed to - indentify generated negative tests. + identify generated negative tests. """ if strip_tags: tags_start = name.find('[') |