Broaden version requirements and upgrade some dependencies (#524)

* Test some new package versions, broaden accepted versions, disable livesync

* Allow flake8 3.6 branch to allow pycodestyle >= 2.4

* Fix pyflakes version and add W504 to flake8 ignores

* Disable livesync by default in settings.py

* Pin pluggy back to <0.8 to match pytest-pythonpath requirements on Python 3.4

* Remove pylint and its dependencies from server/requirements.txt since we are not using it.

* Fix obsolete comment.

* Fix flake8 F841 "local variable is assigned to but never used" error.

* Ignore flake8 W605 "invalid escape sequence" error, at least until Python 2.7 dies.

* flake8 ignores must be space-separated.

* Bump pytest and coverage package versions, together with their dependencies.

server/crashmanager/test_RESTInterface.py

@@ -28,7 +28,7 @@
 haveServer = True
 try:
     requests.get(testServerURL)
-except ConnectionError as e:
+except ConnectionError:
     haveServer = False
 
 

server/ec2spotmanager/CloudProvider/EC2SpotCloudProvider.py

@@ -28,7 +28,7 @@ def wrapper(*args, **kwds):
         except CloudProviderError:
             logging.getLogger("ec2spotmanager").exception("")
             raise
-        except Exception as exc:
+        except Exception:
             logging.getLogger("ec2spotmanager").exception("")
             raise CloudProviderError('%s: unhandled error: %s' % (wrapped.__name__, traceback.format_exc()))
 

server/requirements.txt

@@ -1,51 +1,48 @@
-amqp==2.3.2
-appdirs==1.4.3
-astroid==1.6.4
-atomicwrites==1.1.5
-attrs==18.1.0
+amqp>=2.3.2,<2.4
+appdirs>=1.4.3,<1.5
+atomicwrites>=1.1.5,<1.3
+attrs>=18.1.0,<19
 backports.functools-lru-cache==1.5; python_version == '2.7'
-billiard==3.5.0.3
-boto==2.48.0
+billiard>=3.5.0.3,<3.6
+boto>=2.48.0,<2.50
 boto3==1.7.78
-celery==4.1.1
-certifi==2018.4.16
-chardet==3.0.4
-configparser==3.5.0; python_version == '2.7'
-coverage==4.5.1
-Django==1.11.16
+celery>=4.1.1,<4.3
+certifi>=2018.4.16
+chardet>=3.0.4,<3.1
+configparser>=3.5.0,<3.6; python_version == '2.7'
+coverage==4.5.2
+Django>=1.11.16,<1.12
 django-chartjs==1.3
-djangorestframework==3.8.2
-enum34==1.1.6; python_version == '2.7'
-fasteners==0.14.1
-flake8==3.5.0
-funcsigs==1.0.2; python_version == '2.7'
-futures==3.2.0; python_version == '2.7'
-idna==2.6
-isort==4.3.4
-kombu==4.2.1
+djangorestframework>=3.8.2,<3.9
+enum34>=1.1.6,<1.2; python_version == '2.7'
+fasteners>=0.14.1,<0.15
+flake8>=3.5.0,<3.7
+funcsigs>=1.0.2,<1.1; python_version == '2.7'
+futures>=3.2.0,<3.3; python_version == '2.7'
+idna>=2.6,<2.8
+isort>=4.3.4,<4.4
+kombu>=4.2.1,<4.3
 laniakea==1.15.0
-lazy-object-proxy==1.3.1
-mccabe==0.6.1
+lazy-object-proxy>=1.3.1,<1.4
+mccabe>=0.6.1,<0.7
 monotonic==1.5
-more-itertools==4.2.0
-numpy==1.14.3
-pluggy==0.6.0
-py==1.5.3
-pycodestyle==2.3.1
-pyflakes==1.6.0
-pylint==1.9.1
-pytest==3.6.1
-pytest-cov==2.5.1
-pytest-django==3.2.1
-pytest-flake8==1.0.1
-pytest-pylint==0.9.0
-pytest-pythonpath==0.7.2
-pytz==2018.4
-redis==2.10.6
+more-itertools>=4.2.0,<4.4
+numpy>=1.14.3,<2
+pluggy>=0.7.0,<0.8
+py>=1.5.3
+pycodestyle>=2.4,<2.5
+pyflakes>=2.0.0,<2.1
+pytest>=3.10.0,<4.0
+pytest-cov>=2.6.0,<2.7
+pytest-django>=3.4.4,<3.5
+pytest-flake8>=1.0.1,<1.1
+pytest-pythonpath>=0.7.2,<0.8
+pytz>=2018.4
+redis>=2.10.6,<2.11
 requests==2.20.1
-singledispatch==3.4.0.3; python_version == '2.7'
-six==1.11.0
-urllib3==1.22
-vine==1.1.4
-wrapt==1.10.11
-django-livesync==0.4
+singledispatch>=3.4.0.3,<3.4.1; python_version == '2.7'
+six>=1.11.0,<1.12
+urllib3>=1.22,<2
+vine>=1.1.4,<1.2
+wrapt>=1.10.11,<1.11
+#django-livesync==0.4

server/server/settings.py

@@ -45,7 +45,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'livesync',
+    #'livesync',
     'django.contrib.staticfiles',
     'ec2spotmanager',
     'crashmanager',
@@ -69,7 +69,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'server.middleware.ExceptionLoggingMiddleware',
     'server.middleware.CheckAppPermissionsMiddleware',
-    'livesync.core.middleware.DjangoLiveSyncMiddleware',
+    #'livesync.core.middleware.DjangoLiveSyncMiddleware',
 )
 
 

tox.ini

@@ -1,9 +1,12 @@
 [flake8]
 # This ignore section is for running flake8 standalone vs through pytest
-# See https://github.com/tholo/pytest-flake8/issues/8
 ignore =
     # block comment should start with '# '
     E265
+    # For now we use line break after binary operators,
+    # once we switch we need to change this to W503.
+    W504
+    W605
 exclude =
     # No need to traverse our git directory
     .git,
@@ -23,4 +26,8 @@ python_paths=. server
 flake8-ignore =
     # block comment should start with '# '
     E265
+    # For now we use line break after binary operators,
+    # once we switch we need to change this to W503.
+    W504
+    W605
 addopts = --flake8 -v --cov=. --cov-report term-missing