summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bock <nicolas.bock@canonical.com>2020-10-03 07:28:49 -0600
committerNicolas Bock <nicolas.bock@canonical.com>2020-10-10 06:47:06 -0600
commit8f9c503ecc7f4fc8bd6cb2108256ba3e63bb3b73 (patch)
tree542d4378ecc9c1386320eef5fad53d87fd53b8a0
parent055d1601beb95644e37976d9f4aa3601d5084bc1 (diff)
downloadpython-designateclient-8f9c503ecc7f4fc8bd6cb2108256ba3e63bb3b73.tar.gz
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. Change-Id: If7afefde0f33161016a27774021d27239c642eb5 Co-Authored-By: Michael Chapman <woppin@gmail.com> Signed-off-by: Nicolas Bock <nicolas.bock@canonical.com>
-rw-r--r--designateclient/osc/plugin.py6
-rw-r--r--designateclient/v2/cli/quotas.py2
-rw-r--r--designateclient/v2/recordsets.py4
-rw-r--r--lower-constraints.txt6
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini9
6 files changed, 16 insertions, 13 deletions
diff --git a/designateclient/osc/plugin.py b/designateclient/osc/plugin.py
index 6b8719b..2d088b2 100644
--- a/designateclient/osc/plugin.py
+++ b/designateclient/osc/plugin.py
@@ -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
diff --git a/designateclient/v2/cli/quotas.py b/designateclient/v2/cli/quotas.py
index 2244ca7..76ea7f6 100644
--- a/designateclient/v2/cli/quotas.py
+++ b/designateclient/v2/cli/quotas.py
@@ -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)
diff --git a/designateclient/v2/recordsets.py b/designateclient/v2/recordsets.py
index 188148c..44725de 100644
--- a/designateclient/v2/recordsets.py
+++ b/designateclient/v2/recordsets.py
@@ -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
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 4bfa356..b2f7436 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,11 +1,11 @@
appdirs==1.3.0
asn1crypto==0.23.0
Babel==2.3.4
-cffi==1.7.0
+cffi==1.14.0
cliff==2.8.0
cmd2==0.8.0
coverage==4.0
-cryptography==2.1
+cryptography==3.1
debtcollector==1.2.0
decorator==3.4.0
deprecation==1.0
@@ -14,9 +14,7 @@ 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
diff --git a/test-requirements.txt b/test-requirements.txt
index 1974962..122e6a2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -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
diff --git a/tox.ini b/tox.ini
index db48a9f..f7bb18f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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,9 +92,10 @@ 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