diff options
author | Joshua Harlow <harlowja@gmail.com> | 2013-10-05 21:39:57 +0000 |
---|---|---|
committer | Joshua Harlow <harlowja@gmail.com> | 2013-10-05 21:49:08 +0000 |
commit | b1f81badfd2b7b3ef15cc57f7b502e5f40bb06a0 (patch) | |
tree | 0d54e86eebcf5c44d3c70e007faa726c1ba2b30a | |
parent | 6ccac5f334f6f8c2eb7aa60deb4ae28ef7121434 (diff) | |
download | taskflow-b1f81badfd2b7b3ef15cc57f7b502e5f40bb06a0.tar.gz |
Bump requirements to the latest
Match the requirements for taskflow with
the openstack requirements (note the upstream
requirements are missing 'futures' and 'networkx')
and update the new hacking violations that were
detected due to the hacking requirement version
bump.
Change-Id: I8d1326cf2a8b1ea062f5e9aacd0c4f8261c6531a
-rw-r--r-- | requirements.txt | 13 | ||||
-rw-r--r-- | setup.py | 1 | ||||
-rw-r--r-- | taskflow/examples/calculate_in_parallel.py | 18 | ||||
-rw-r--r-- | taskflow/examples/calculate_linear.py | 18 | ||||
-rw-r--r-- | taskflow/examples/complex_graph.py | 18 | ||||
-rw-r--r-- | taskflow/examples/fake_boot_vm.py | 18 | ||||
-rw-r--r-- | taskflow/examples/graph_flow.py | 18 | ||||
-rw-r--r-- | taskflow/examples/reverting_linear.py | 18 | ||||
-rw-r--r-- | taskflow/examples/simple_linear.py | 18 | ||||
-rw-r--r-- | taskflow/examples/simple_linear_listening.py | 18 | ||||
-rw-r--r-- | taskflow/examples/wrapped_exception.py | 17 | ||||
-rw-r--r-- | taskflow/persistence/backends/sqlalchemy/alembic/env.py | 18 | ||||
-rw-r--r-- | taskflow/persistence/backends/sqlalchemy/alembic/versions/1c783c0c2875_replace_exception_an.py | 18 | ||||
-rw-r--r-- | taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py | 18 | ||||
-rw-r--r-- | test-requirements.txt | 7 | ||||
-rw-r--r-- | tox.ini | 4 |
16 files changed, 228 insertions, 12 deletions
diff --git a/requirements.txt b/requirements.txt index e95ab5b..e1e7ee3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,17 @@ # Packages needed for using this library. -anyjson>=0.2.4 -iso8601 +anyjson>=0.3.3 +iso8601>=0.1.4 six # Only needed if database backend used. -sqlalchemy>=0.7,<=0.7.99 +SQLAlchemy>=0.7.8,<=0.7.99 alembic>=0.4.1 # Very nice graph library networkx>=1.8.1 -Babel>=0.9.6 -# Used for backend storage engine loading +Babel>=1.3 +# Used for backend storage engine loading. stevedore>=0.10 # Backport for concurrent.futures which exists in 3.2+ futures>=2.1.3 +# NOTE(harlowja): if you want to be able to use the graph_utils +# export_graph_to_dot function you will need to uncomment the following. +# pydot>=1.0 @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools setuptools.setup( diff --git a/taskflow/examples/calculate_in_parallel.py b/taskflow/examples/calculate_in_parallel.py index 7b8f8a3..0c6425b 100644 --- a/taskflow/examples/calculate_in_parallel.py +++ b/taskflow/examples/calculate_in_parallel.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import sys diff --git a/taskflow/examples/calculate_linear.py b/taskflow/examples/calculate_linear.py index d5cb24c..e40c2a9 100644 --- a/taskflow/examples/calculate_linear.py +++ b/taskflow/examples/calculate_linear.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import sys diff --git a/taskflow/examples/complex_graph.py b/taskflow/examples/complex_graph.py index 9dc9126..0289171 100644 --- a/taskflow/examples/complex_graph.py +++ b/taskflow/examples/complex_graph.py @@ -1,4 +1,20 @@ - +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. import logging import os diff --git a/taskflow/examples/fake_boot_vm.py b/taskflow/examples/fake_boot_vm.py index eba7334..6a7e999 100644 --- a/taskflow/examples/fake_boot_vm.py +++ b/taskflow/examples/fake_boot_vm.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import random diff --git a/taskflow/examples/graph_flow.py b/taskflow/examples/graph_flow.py index 56041b2..744e976 100644 --- a/taskflow/examples/graph_flow.py +++ b/taskflow/examples/graph_flow.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import sys diff --git a/taskflow/examples/reverting_linear.py b/taskflow/examples/reverting_linear.py index b1f45a2..c6f4f1f 100644 --- a/taskflow/examples/reverting_linear.py +++ b/taskflow/examples/reverting_linear.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import sys diff --git a/taskflow/examples/simple_linear.py b/taskflow/examples/simple_linear.py index fb2a7c1..c9ad346 100644 --- a/taskflow/examples/simple_linear.py +++ b/taskflow/examples/simple_linear.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import sys diff --git a/taskflow/examples/simple_linear_listening.py b/taskflow/examples/simple_linear_listening.py index 0fbe261..d557b58 100644 --- a/taskflow/examples/simple_linear_listening.py +++ b/taskflow/examples/simple_linear_listening.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + import logging import os import sys diff --git a/taskflow/examples/wrapped_exception.py b/taskflow/examples/wrapped_exception.py index 255c285..d73e0c1 100644 --- a/taskflow/examples/wrapped_exception.py +++ b/taskflow/examples/wrapped_exception.py @@ -1,3 +1,20 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. import contextlib import logging diff --git a/taskflow/persistence/backends/sqlalchemy/alembic/env.py b/taskflow/persistence/backends/sqlalchemy/alembic/env.py index c47b872..615c5d7 100644 --- a/taskflow/persistence/backends/sqlalchemy/alembic/env.py +++ b/taskflow/persistence/backends/sqlalchemy/alembic/env.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + from __future__ import with_statement from alembic import context from sqlalchemy import engine_from_config, pool diff --git a/taskflow/persistence/backends/sqlalchemy/alembic/versions/1c783c0c2875_replace_exception_an.py b/taskflow/persistence/backends/sqlalchemy/alembic/versions/1c783c0c2875_replace_exception_an.py index a994e1a..075355d 100644 --- a/taskflow/persistence/backends/sqlalchemy/alembic/versions/1c783c0c2875_replace_exception_an.py +++ b/taskflow/persistence/backends/sqlalchemy/alembic/versions/1c783c0c2875_replace_exception_an.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + """Replace exception and stacktrace with failure column Revision ID: 1c783c0c2875 diff --git a/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py b/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py index 0bb45db..293bf0c 100644 --- a/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py +++ b/taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py @@ -1,3 +1,21 @@ +# -*- coding: utf-8 -*- + +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (C) 2012-2013 Yahoo! Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + """initial_logbook_details_tables Revision ID: 1cea328f0f65 diff --git a/test-requirements.txt b/test-requirements.txt index fdc29b9..092a759 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,11 +1,10 @@ # Install bounded pep8/pyflakes first, then let flake8 install pep8==1.4.5 -pyflakes==0.7.2 +pyflakes>=0.7.2,<0.7.4 flake8==2.0 -hacking>=0.5.3,<0.6 +hacking>=0.5.6,<0.8 -coverage -distribute>=0.6.24 +coverage>=3.6 mock>=1.0 nose nose-exclude @@ -40,6 +40,6 @@ setenv = NOSE_WITH_COVERAGE=1 commands = {posargs} [flake8] -ignore = H402 +ignore = H202,H402 builtins = _ -exclude = .venv,.tox,dist,doc,*openstack/common*,*egg,.git,build,tools +exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools |