Fix spelling of Python 3.5-specific requirements

.github/workflows/tox.yml

@@ -37,7 +37,7 @@ jobs:
           sudo apt update
           cat dependencies.txt | xargs sudo apt install -y
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions
+          pip install 'tox<4' 'tox-gh-actions<3'
       - name: Start redis
         run: sudo systemctl start redis-server
       - name: Setup tox, dependencies, and run tests

requirements.tests.txt

@@ -25,6 +25,8 @@ eventlet==0.30.2;python_version<"3.10"
 eventlet>0.33;python_version>="3.10"
 gevent==20.9.0;python_version<"3.10"
 gevent>21;python_version>="3.10"
+# ABI change, incompatible with gevent<22.10.2
+greenlet<2;python_version<"3.10"
 # the bottom pin is for limbo test runs, as latest version doesn't work with
 # newer celery versions
 redis>=3.2.0

setup.cfg

@@ -42,31 +42,31 @@ packages = talisker
 test_suite = tests
 package_dir = talisker=talisker
 install_requires =
-	Werkzeug~=1.0;python_version~="3.5"
-	Werkzeug<3;python_version>"3.6"
-	statsd~=3.3;python_version~="3.5"
-	statsd<4;python_version>"3.6"
-	requests~=2.25;python_version~="3.5"
+	Werkzeug~=1.0;python_version~="3.5.0"
+	Werkzeug<3;python_version>="3.6"
+	statsd~=3.3;python_version~="3.5.0"
+	statsd<4;python_version>="3.6"
+	requests~=2.25;python_version~="3.5.0"
 	requests<3.0;python_version>"3.5"
 	future~=0.18
-	contextvars~=2.4;python_version~="3.5"
+	contextvars~=2.4;python_version>="3.5" and python_version<"3.7"
 
 [options.extras_require]
 gunicorn = gunicorn>=19.7.0
 raven = raven>=6.4.0
 celery =
-	celery~=4.4;python_version~="3.5"
+	celery~=4.4;python_version~="3.5.0"
 	celery>=4,<5.3;python_version>"3.5"
 django =
-    django~=2.2;python_version~="3.5"
+	django~=2.2;python_version~="3.5.0"
 	django<4;python_version>"3.5"
 prometheus =
-	prometheus-client~=0.7.0;python_version~="3.5"
+	prometheus-client~=0.7.0;python_version~="3.5.0"
 	prometheus-client<0.8;python_version>"3.5"
 flask =
-	flask~=1.1;python_version~="3.5"
+	flask~=1.1;python_version~="3.5.0"
 	flask<3;python_version>"3.5"
-	blinker~=1.5;python_version~="3.5"
+	blinker~=1.5;python_version~="3.5.0"
 	blinker<2;python_version>"3.5"
 dev =
 	logging_tree>=1.9
@@ -77,7 +77,7 @@ pg =
 	sqlparse>=0.4.2
 	psycopg2>=2.8,<3.0
 asyncio =
-	aiocontextvars==0.2.2;python_version~="3.5"
+	aiocontextvars==0.2.2;python_version>="3.5.3" and python_version<"3.7"
 gevent = gevent>=20.9.0
 
 [options.package_data]

setup.py

@@ -142,10 +142,10 @@
     ),
     extras_require=dict(
         asyncio=[
-            'aiocontextvars==0.2.2;python_version~="3.5"',
+            'aiocontextvars==0.2.2;python_version>="3.5.3" and python_version<"3.7"',
         ],
         celery=[
-            'celery~=4.4;python_version~="3.5"',
+            'celery~=4.4;python_version~="3.5.0"',
             'celery>=4,<5.3;python_version>"3.5"',
         ],
         dev=[
@@ -155,13 +155,13 @@
             'objgraph>=3.5',
         ],
         django=[
-            'django~=2.2;python_version~="3.5"',
+            'django~=2.2;python_version~="3.5.0"',
             'django<4;python_version>"3.5"',
         ],
         flask=[
-            'flask~=1.1;python_version~="3.5"',
+            'flask~=1.1;python_version~="3.5.0"',
             'flask<3;python_version>"3.5"',
-            'blinker~=1.5;python_version~="3.5"',
+            'blinker~=1.5;python_version~="3.5.0"',
             'blinker<2;python_version>"3.5"',
         ],
         gevent=[
@@ -175,7 +175,7 @@
             'psycopg2>=2.8,<3.0',
         ],
         prometheus=[
-            'prometheus-client~=0.7.0;python_version~="3.5"',
+            'prometheus-client~=0.7.0;python_version~="3.5.0"',
             'prometheus-client<0.8;python_version>"3.5"',
         ],
         raven=[
@@ -184,14 +184,14 @@
     ),
     include_package_data=True,
     install_requires=[
-        'Werkzeug~=1.0;python_version~="3.5"',
-        'Werkzeug<3;python_version>"3.6"',
-        'statsd~=3.3;python_version~="3.5"',
-        'statsd<4;python_version>"3.6"',
-        'requests~=2.25;python_version~="3.5"',
+        'Werkzeug~=1.0;python_version~="3.5.0"',
+        'Werkzeug<3;python_version>="3.6"',
+        'statsd~=3.3;python_version~="3.5.0"',
+        'statsd<4;python_version>="3.6"',
+        'requests~=2.25;python_version~="3.5.0"',
         'requests<3.0;python_version>"3.5"',
         'future~=0.18',
-        'contextvars~=2.4;python_version~="3.5"',
+        'contextvars~=2.4;python_version>="3.5" and python_version<"3.7"',
     ],
     keywords=[
         'talisker',

tests/test_endpoints.py

@@ -29,6 +29,7 @@
 import talisker.statsd
 import talisker.endpoints
 from talisker.endpoints import StandardEndpointMiddleware
+from talisker.util import pkg_is_installed
 
 from tests.test_metrics import counter_name
 
@@ -330,6 +331,8 @@ def test_info_workers():
 
 
 def test_info_objgraph():
+    if not pkg_is_installed('objgraph'):
+        pytest.skip('objgraph not installed')
     client = get_client()
     response = client.get('/_status/info/objgraph',
                           environ_overrides={'REMOTE_ADDR': b'127.0.0.1'})

tox.ini

@@ -12,7 +12,9 @@ python =
 
 [testenv]
 usedevelop = True
-deps = -r{toxinidir}/requirements.tests.txt
+deps =
+    -r{toxinidir}/requirements.tests.txt
+    {toxinidir}
 commands = py.test -v --cov=talisker --no-success-flaky-report
 extras =
     gunicorn