Merge pull request #110 from virtapi/python38-fixes

fix lint errors and prospector dependency for py3.8
virtapi · Jun 17, 2020 · 6ba9960 · 6ba9960
2 parents 9e49bad + 21af93c
commit 6ba9960
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.prospector.yaml b/.prospector.yaml
@@ -22,6 +22,8 @@ pylint:
     - unused-variable
   disable:
     - inconsistent-return-statements
+    - import-outside-toplevel
+    - cyclic-import
 dodgy:
   run: true
 mccabe:

diff --git a/marmoset/cli/pxe_parser.py b/marmoset/cli/pxe_parser.py
@@ -31,9 +31,9 @@ def add_to(parser, name, **kwargs):
         'this will be used for tracking the status'
         'of an installation', default=None)
     pxe_create.add_argument(
-            '--ipv6_address', help='IPv6 Address', default=None)
+        '--ipv6_address', help='IPv6 Address', default=None)
     pxe_create.add_argument(
-            '--ipv6_gateway', help='IPv6 Gateway', default=None)
+        '--ipv6_gateway', help='IPv6 Gateway', default=None)
     pxe_create.add_argument('--ipv6_prefix', help='IPv6 Prefix', default=None)
 
     pxe_list = subcommands.add_parser(

diff --git a/marmoset/imagecatalog/catalog.py b/marmoset/imagecatalog/catalog.py
@@ -10,7 +10,6 @@ class ImageCatalog:
 
     def __init__(self):
         """We don't initialize anything here."""
-        pass
 
     def list_all_image_files(self):
         all_images = []

diff --git a/marmoset/pxe/exceptions.py b/marmoset/pxe/exceptions.py
@@ -11,5 +11,3 @@ def __init__(self, message):
 
 class InputError(Error):
     """Dummy class."""
-
-    pass
diff --git a/marmoset/validation.py b/marmoset/validation.py
@@ -8,7 +8,7 @@
 
 def is_mac(mac):
     """Return True if param is a valid MAC."""
-    return True if re.match("^%s$" % MAC_REGEX, mac) else False
+    re.match("^%s$" % MAC_REGEX, mac)
 
 
 def is_ipv4(ipaddr):

diff --git a/requirements.txt b/requirements.txt
@@ -1,14 +1,15 @@
-aniso8601==4.0.1
-Flask==1.0.2
-Flask-RESTful==0.3.7
-itsdangerous==1.1.0
-Jinja2==2.10
-ldap3==2.5.1
-MarkupSafe==1.1.0
-pyasn1==0.4.4
-python-dateutil==2.7.5
-pytz==2018.7
-six==1.12.0
-Werkzeug==0.14.1
-wheel==0.32.3
-pyyaml==3.13
+astroid>=2.3.0
+aniso8601>=8.0.0
+Flask>=1.1.2
+Flask-RESTful>=0.3.8
+itsdangerous>=1.1.0
+Jinja2>=2.11.2
+ldap3>=2.7
+MarkupSafe>=1.1.1
+pyasn1>=0.4.8
+python-dateutil>=2.8.1
+pytz>=2020.1
+six>=1.15.0
+Werkzeug>=1.0.1
+wheel>=0.34.2
+pyaml>=20.4.0
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@ def read(fname):
 
 setup(
     name='marmoset',
-    version='0.6.0',
+    version='0.7.0',
     description='Simple HTTP API for managing stuff on libvirt hosts',
     keywords='dhcp dhcpd ldap libvirt management vms virtual-machines',
     author='https://github.com/virtapi/marmoset/graphs/contributors',
@@ -29,9 +29,9 @@ def read(fname):
     tests_require=['nose>=1.3.7',
                    'mock>=1.3.0',
                    'testfixtures>=4.7.0',
-                   'prospector'],
+                   'prospector[pyroma]'],
     test_suite='nose.collector',
-    license='GNU Affero General Public License',
+    license='GNU Affero General Public License v3',
     author_email='tim@bastelfreak.de',
     zip_safe=False,
     long_description=read('README.md'),
@@ -47,6 +47,6 @@ def read(fname):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
-        'License :: OSI Approved :: GNU Affero General Public License v3.0 only (AGPL-3.0-only)',
+        'License :: OSI Approved :: GNU Affero General Public License v3',
     ]
 )
diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@ commands=nosetests --with-xunit
 deps =
     {[testenv]deps}
     maxcdn
-    -e git+https://github.com/bastelfreak/prospector.git@7ee096e5d96bf6457550bcec8e31944cf554631a#egg=prospector[with_everything]
+    prospector[with_pyroma]
 commands =
     prospector \
     --die-on-tool-error \