Increase hacking version

Increase the hacking version in test-requirements to match the
version used in the `designate` project.

This change fixes a few errors that the more recent `pyflakes` flags.

(michchap) added lower constraints job removal

Change-Id: If7afefde0f33161016a27774021d27239c642eb5
Co-Authored-By: Michael Chapman <woppin@gmail.com>
Signed-off-by: Nicolas Bock <nicolas.bock@canonical.com>
(cherry picked from commit 8f9c503ecc)
This commit is contained in:
Nicolas Bock 2020-10-03 07:28:49 -06:00 committed by Michael Chapman
parent 055d1601be
commit 5e14505147
7 changed files with 14 additions and 93 deletions

View File

@ -3,7 +3,6 @@
- check-requirements
- designate-devstack-jobs
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- openstack-python3-victoria-jobs
- openstackclient-plugin-jobs
- publish-openstack-docs-pti

View File

@ -46,8 +46,8 @@ def build_option_parser(parser):
'--os-dns-api-version',
metavar='<dns-api-version>',
default=os.environ.get('OS_DNS_API_VERSION', '2'),
help='DNS API version, default=' +
DEFAULT_API_VERSION +
' (Env: OS_DNS_API_VERSION)')
help=('DNS API version, default=' +
DEFAULT_API_VERSION +
' (Env: OS_DNS_API_VERSION)'))
return parser

View File

@ -67,7 +67,7 @@ class SetQuotasCommand(show.ShowOne):
"""Set quotas"""
def _build_options_list(self):
return itertools.chain(DNS_QUOTAS.items())
return itertools.chain(DNS_QUOTAS.items())
def get_parser(self, prog_name):
parser = super(SetQuotasCommand, self).get_parser(prog_name)

View File

@ -26,8 +26,8 @@ class RecordSetController(V2Controller):
# If we get a zone name we'll need to get the ID of it before POST.
if isinstance(zone, six.string_types) and not \
uuidutils.is_uuid_like(zone):
zone_info = self.client.zones.get(zone)
uuidutils.is_uuid_like(zone):
zone_info = self.client.zones.get(zone)
elif isinstance(zone, dict):
zone_info = zone

View File

@ -1,77 +0,0 @@
appdirs==1.3.0
asn1crypto==0.23.0
Babel==2.3.4
cffi==1.7.0
cliff==2.8.0
cmd2==0.8.0
coverage==4.0
cryptography==2.1
debtcollector==1.2.0
decorator==3.4.0
deprecation==1.0
dogpile.cache==0.6.2
dulwich==0.15.0
extras==1.0.0
fasteners==0.7.0
fixtures==3.0.0
flake8==2.5.5
future==0.16.0
hacking==0.12.0
idna==2.6
iso8601==0.1.11
jmespath==0.9.0
jsonpatch==1.16
jsonpointer==1.13
jsonschema==2.6.0
keystoneauth1==3.4.0
linecache2==1.0.0
mccabe==0.2.1
monotonic==0.6
mox3==0.20.0
msgpack-python==0.4.0
munch==2.1.0
netaddr==0.7.18
netifaces==0.10.4
openstacksdk==0.11.2
os-client-config==1.28.0
os-service-types==1.2.0
os-testr==1.0.0
osc-lib==1.8.0
oslo.concurrency==3.25.0
oslo.config==5.2.0
oslo.context==2.19.2
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.serialization==2.18.0
oslo.utils==3.33.0
oslotest==3.2.0
paramiko==2.0.0
pbr==2.0.0
pep8==1.5.7
prettytable==0.7.2
pyasn1==0.1.8
pycparser==2.18
pyflakes==0.8.1
pyinotify==0.9.6
pyparsing==2.1.0
pyperclip==1.5.27
python-dateutil==2.5.3
python-mimeparse==1.6.0
python-subunit==1.0.0
pytz==2013.6
PyYAML==3.12
reno==3.1.0
requests==2.14.2
requests-mock==1.2.0
requestsexceptions==1.2.0
rfc3986==0.3.1
simplejson==3.5.1
six==1.10.0
stevedore==1.20.0
tempest==17.1.0
stestr==2.0.0
testtools==2.2.0
traceback2==1.4.0
unittest2==1.1.0
urllib3==1.21.1
wrapt==1.7.0

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8
hacking>=1.1.0,<1.2.0 # Apache-2.0
hacking>=3.0.1,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0

15
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,flake8
envlist = py36,py37,py38,flake8
minversion = 3.1.0
skipsdist = True
skip_missing_interpreters = true
@ -75,6 +75,10 @@ setenv =
setenv =
{[testenv:functional]setenv}
[testenv:functional-py38]
setenv =
{[testenv:functional]setenv}
[testenv:releasenotes]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@ -88,14 +92,9 @@ commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenote
# H404 multi line docstring should start with a summary
# H405 multi line docstring summary not separated with an empty line
# H904 Wrap long lines in parentheses instead of a backslash
# W504 line break after binary operator
# See designate for other ignored codes that may apply here
ignore = H105, H302,H402,H404,H405,H904
ignore = H105,H302,H402,H404,H405,W504,H904
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
[testenv:lower-constraints]
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt