diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 10 | ||||
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rw-r--r-- | lower-constraints.txt | 76 | ||||
| -rw-r--r-- | taskflow/persistence/backends/sqlalchemy/alembic/versions/1cea328f0f65_initial_logbook_deta.py | 18 | ||||
| -rw-r--r-- | tox.ini | 6 |
6 files changed, 19 insertions, 94 deletions
@@ -62,4 +62,6 @@ doc/build/ env # files created by releasenotes build +RELEASENOTES.rst +releasenotes/notes/reno.cache releasenotes/build diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9d94556..08aef91 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: ebc15addedad713c86ef18ae9632c88e187dd0af # v3.1.0 + rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0 hooks: - id: trailing-whitespace # Replaces or checks mixed line ending @@ -27,9 +27,13 @@ repos: - id: debug-statements - id: check-yaml files: .*\.(yaml|yml)$ - - repo: https://gitlab.com/pycqa/flake8 - rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3 + - repo: local hooks: - id: flake8 + name: flake8 additional_dependencies: - hacking>=3.0.1,<3.1.0 + language: python + entry: flake8 + files: '^.*\.py$' + exclude: '^(doc|releasenotes|tools)/.*$' @@ -2,7 +2,6 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-lower-constraints-jobs - openstack-cover-jobs - openstack-python3-wallaby-jobs - periodic-stable-jobs diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index df953e9..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,76 +0,0 @@ -alabaster==0.7.10 -alembic==0.8.10 -amqp==2.1.1 -appdirs==1.3.0 -automaton==1.9.0 -Babel==2.3.4 -cachetools==2.0.0 -chardet==3.0.4 -contextlib2==0.4.0 -decorator==3.4.0 -doc8==0.6.0 -docutils==0.11 -eventlet==0.18.2 -extras==1.0.0 -fasteners==0.7.0 -fixtures==3.0.0 -flake8==2.2.4 -futurist==1.2.0 -greenlet==0.4.15 -hacking==0.10.0 -imagesize==0.7.1 -iso8601==0.1.11 -Jinja2==2.10 -jsonschema==3.2.0 -kazoo==2.6.0 -keystoneauth1==3.4.0 -kombu==4.3.0 -linecache2==1.0.0 -Mako==0.4.0 -MarkupSafe==1.1.1 -mccabe==0.2.1 -mock==2.0.0 -monotonic==0.6 -mox3==0.20.0 -msgpack-python==0.4.0 -netaddr==0.7.18 -netifaces==0.10.4 -networkx==2.1.0 -os-client-config==1.28.0 -oslo.i18n==3.15.3 -oslo.serialization==2.18.0 -oslo.utils==3.33.0 -oslotest==3.2.0 -pbr==2.0.0 -pep8==1.5.7 -prettytable==0.7.2 -psycopg2==2.8.0 -pydot==1.2.4 -pydotplus==2.0.2 -pyflakes==0.8.1 -Pygments==2.2.0 -PyMySQL==0.7.6 -pyparsing==2.1.0 -python-editor==1.0.3 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.13 -redis==2.10.0 -requests==2.14.2 -requestsexceptions==1.2.0 -restructuredtext-lint==1.1.1 -six==1.10.0 -snowballstemmer==1.2.1 -SQLAlchemy-Utils==0.30.11 -SQLAlchemy==1.0.10 -stevedore==1.20.0 -tenacity==6.0.0 -stestr==2.0.0 -testscenarios==0.4 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 -vine==1.1.4 -wrapt==1.7.0 -zake==0.1.6 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 be2cf97..ec1e730 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 @@ -41,17 +41,17 @@ def _get_indexes(): # up and fetched, so attempt to ensure that that is done quickly. indexes = [ { - 'name': 'logbook_uuid_idx', + 'index_name': 'logbook_uuid_idx', 'table_name': 'logbooks', 'columns': ['uuid'], }, { - 'name': 'flowdetails_uuid_idx', + 'index_name': 'flowdetails_uuid_idx', 'table_name': 'flowdetails', 'columns': ['uuid'], }, { - 'name': 'taskdetails_uuid_idx', + 'index_name': 'taskdetails_uuid_idx', 'table_name': 'taskdetails', 'columns': ['uuid'], }, @@ -63,18 +63,18 @@ def _get_foreign_keys(): f_keys = [ # Flow details uuid -> logbook parent uuid { - 'name': 'flowdetails_ibfk_1', - 'source': 'flowdetails', - 'referent': 'logbooks', + 'constraint_name': 'flowdetails_ibfk_1', + 'source_table': 'flowdetails', + 'referent_table': 'logbooks', 'local_cols': ['parent_uuid'], 'remote_cols': ['uuid'], 'ondelete': 'CASCADE', }, # Task details uuid -> flow details parent uuid { - 'name': 'taskdetails_ibfk_1', - 'source': 'taskdetails', - 'referent': 'flowdetails', + 'constraint_name': 'taskdetails_ibfk_1', + 'source_table': 'taskdetails', + 'referent_table': 'flowdetails', 'local_cols': ['parent_uuid'], 'remote_cols': ['uuid'], 'ondelete': 'CASCADE', @@ -1,6 +1,6 @@ [tox] minversion = 3.1.0 -envlist = cover,docs,pep8,py38,pylint,update-states +envlist = cover,docs,pep8,py3,pylint,update-states ignore_basepython_conflict = True [testenv] @@ -87,7 +87,3 @@ deps = bindep commands = bindep test usedevelop = False -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - .[test,workers,zookeeper,database,redis,eventlet] |