Support pip 19+ (#17)

* Support obsoletion of dependency links

* Adopt nox over tox

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120

.gitignore

@@ -5,6 +5,7 @@
 *.pytest_cache
 .coverage
 .python-version
+.nox
 .tox
 build/
 dist/

README.md

@@ -89,10 +89,16 @@ It's also possible to install the supported instrumentors as package extras:
 
 ```bash
   # Supported extras are dbapi, django, flask, pymongo, pymysql, redis, requests, tornado
-  $ pip install --process-dependency-links 'signalfx-tracing[django,redis,requests]'
+  $ pip install 'signalfx-tracing[django,redis,requests]'
 ```
 
-**Note: It's necessary to include `--process-dependency-links` to obtain the desired instrumentor versions.**
+**Note: For pip versions earlier than 18.0, it's necessary to include `--process-dependency-links` to
+obtain the desired instrumentor versions.**
+
+```bash
+   # pip versions <18.0
+   $ pip install --process-dependency-links 'signalfx-tracing[jaeger,tornado]'
+```
 
 ### Tracer
 Not all stable versions of OpenTracing-compatible tracers support the 2.0 API, so we provide
@@ -103,7 +109,9 @@ ready for reporting to SignalFx. You can obtain an instance of the suggested Jae
 ```sh
   $ sfx-py-trace-bootstrap
 
-  # or as package extra (please note required --process-dependency-links)
+  # or as package extra
+  $ pip install 'signalfx-tracing[jaeger]'
+  # please use required --process-dependency-links for pip versions <18.0 
   $ pip install --process-dependency-links 'signalfx-tracing[jaeger]'
 
   # or from project source tree, along with applicable instrumentors

noxfile.py

@@ -0,0 +1,238 @@
+# Copyright (C) 2019 SignalFx, Inc. All rights reserved.
+import nox
+
+# pytest-django incompatible w/ pytest 4.2
+pytest = 'pytest<4.2'  # https://github.com/pytest-dev/pytest-django/issues/698
+
+
+def install_unit_tests(session, *other_packaages):
+    return session.install(pytest, '.[unit_tests]', *other_packaages)
+
+
+def pip_check(session):
+    return session.run('pip', 'check')
+
+
+def pip_freeze(session):
+    return session.run('pip', 'freeze')
+
+
+@nox.session(reuse_venv=True)
+def flake8(session):
+    session.install('flake8')
+    pip_freeze(session)
+    session.run('flake8', 'setup.py' 'bootstrap.py', 'signalfx_tracing', 'tests', 'noxfile.py')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+def unit(session):
+    install_unit_tests(session)
+    pip_freeze(session)
+    session.run('pytest', 'tests/unit', '--ignore', 'tests/unit/libraries', '-p', 'no:django')
+
+
+def test_django(session):
+    session.run('pytest', 'tests/unit/libraries/django_')
+    session.run('pytest', 'tests/integration/django_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+def django18_via_bootrap(session):
+    # provides coverage for desired version installation via bootstrap
+    install_unit_tests(session, 'django>=1.8,<1.9', 'pytest-django', 'django-opentracing')
+    session.run('sfx-py-trace-bootstrap')
+    pip_check(session)
+    pip_freeze(session)
+    test_django(session)
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('pip', ('<11', '>=18,<19', '>=19,<20'))
+def django18_via_extras(session, pip):
+    install_unit_tests(session, f'pip{pip}', 'django>=1.8,<1.9', 'pytest-django')
+
+    django_extra_args = ['.[django]']
+    if pip == '<11':
+        django_extra_args.insert(0, '--process-dependency-links')
+    session.install(*django_extra_args)
+
+    pip_check(session)
+    pip_freeze(session)
+    test_django(session)
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('django', ('>=1.9,<1.10', '>=1.10,<1.11', '>=1.11,<1.12'))
+def django19_110_111_via_extras(session, django):
+    install_unit_tests(session, f'django{django}', 'pytest-django', '.[django]')
+    pip_check(session)
+    pip_freeze(session)
+    test_django(session)
+
+
+@nox.session(python=('3.4', '3.5', '3.6'), reuse_venv=True)
+def django20_via_extras(session):
+    install_unit_tests(session, 'django>=2.0,<2.1', 'pytest-django', '.[django]')
+    pip_check(session)
+    pip_freeze(session)
+    test_django(session)
+
+
+@nox.session(python=('3.5', '3.6'), reuse_venv=True)
+def django21_via_extras(session):
+    install_unit_tests(session, 'django>=2.1,<2.2', 'pytest-django', '.[django]')
+    pip_check(session)
+    pip_freeze(session)
+    test_django(session)
+
+
+def test_elasticsearch(session, image_version):
+    session.run('pytest', 'tests/unit/libraries/elasticsearch_')
+    session.run('pytest', '--elasticsearch-image-version', image_version, 'tests/integration/elasticsearch_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('elasticsearch', ('>=2.0,<2.1', '>=2.1,<2.2', '>=2.2,<2.3', '>=2.3,<2.4', '>=2.4,<2.5'))
+def elasticsearch2_via_extras(session, elasticsearch):
+    install_unit_tests(session, f'elasticsearch{elasticsearch}', 'docker', '.[elasticsearch]')
+    pip_check(session)
+    pip_freeze(session)
+    test_elasticsearch(session, '2.4.6')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('elasticsearch', ('>=5.0,<5.1', '>=5.1,<5.2', '>=5.2,<5.3', '>=5.3,<5.4', '>=5.4,<5.5', '>=5.5,<5.6'))
+def elasticsearch5_via_extras(session, elasticsearch):
+    install_unit_tests(session, f'elasticsearch{elasticsearch}', 'docker', '.[elasticsearch]')
+    pip_check(session)
+    pip_freeze(session)
+    test_elasticsearch(session, '5.6.14')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('elasticsearch', ('>=6.0,<6.1', '>=6.1,<6.2', '>=6.2,<6.3', '>=6.3,<6.4'))
+def elasticsearch6i_via_extras(session, elasticsearch):
+    install_unit_tests(session, f'elasticsearch{elasticsearch}', 'docker', '.[elasticsearch]')
+    pip_check(session)
+    pip_freeze(session)
+    test_elasticsearch(session, '6.5.4')
+
+
+def test_flask(session):
+    session.run('pytest', 'tests/unit/libraries/flask_')
+    session.run('pytest', 'tests/integration/flask_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+def flask010_via_bootrap(session):
+    # provides coverage for desired version installation via bootstrap
+    install_unit_tests(session, 'flask>=0.10,<0.11', 'requests', 'flask-opentracing')
+    session.run('sfx-py-trace-bootstrap')
+    pip_check(session)
+    pip_freeze(session)
+    test_flask(session)
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('pip', ('<11', '>=18,<19', '>=19,<20'))
+def flask010_via_extras(session, pip):
+    install_unit_tests(session, f'pip{pip}', 'flask>=0.10,<0.11', 'requests')
+    flask_extra_args = ['.[flask]']
+    if pip == '<11':
+        flask_extra_args.insert(0, '--process-dependency-links')
+    session.install(*flask_extra_args)
+
+    pip_check(session)
+    pip_freeze(session)
+    test_flask(session)
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('flask', ('>=0.11,<0.12', '>=0.12,<0.13', '>=1.0,<1.1'))
+def flask_via_extras(session, flask):
+    install_unit_tests(session, f'flask{flask}', 'requests', '.[flask]')
+    pip_check(session)
+    pip_freeze(session)
+    test_flask(session)
+
+
+def test_jaeger(session):
+    session.run('pytest', 'tests/integration/test_jaeger_client.py')
+    session.run('pytest', 'tests/integration/test_runner.py')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+def jaeger_via_bootrap(session):
+    # provides coverage for desired version installation via bootstrap
+    install_unit_tests(session, 'jaeger-client')
+    session.run('sfx-py-trace-bootstrap')
+    pip_check(session)
+    pip_freeze(session)
+    test_jaeger(session)
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('pip', ('<11', '>=18,<19', '>=19,<20'))
+def jaeger_via_extras(session, pip):
+    install_unit_tests(session, f'pip{pip}')
+
+    jaeger_extra_args = ['.[jaeger,tornado]']
+    if pip == '<11':
+        jaeger_extra_args.insert(0, '--process-dependency-links')
+    session.install(*jaeger_extra_args)
+
+    pip_check(session)
+    pip_freeze(session)
+    test_jaeger(session)
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+def psycopg2_via_extras(session):
+    install_unit_tests(session, 'psycopg2>=2.7,<2.8', 'docker', '.[psycopg2]')
+    session.run('pytest', 'tests/unit/libraries/psycopg2_')
+    session.run('pytest', 'tests/integration/psycopg2_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('pymongo', ('>=3.1,<3.2', '>=3.2,<3.3', '>=3.3,<3.4', '>=3.4,<3.5',
+                             '>=3.5,<3.6', '>=3.6,<3.7', '>=3.7,<3.8'))
+def pymongo_via_extras(session, pymongo):
+    install_unit_tests(session, 'pymongo{pymongo}', 'docker', 'mockupdb', '.[pymongo]')
+    session.run('pytest', 'tests/unit/libraries/pymongo_')
+    session.run('pytest', 'tests/integration/pymongo_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('pymysql', ('>=0.8,<0.9', '>=0.9,<0.10'))
+def pymysql_via_extras(session, pymysql):
+    install_unit_tests(session, f'pymysql{pymysql}', 'docker', '.[pymysql]')
+    session.run('pytest', 'tests/unit/libraries/pymysql_')
+    session.run('pytest', 'tests/integration/pymysql_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+def redis_via_extras(session):
+    install_unit_tests(session, f'redis>=2.10,<2.11', 'docker', '.[redis]')
+    session.run('pytest', 'tests/unit/libraries/redis_')
+    session.run('pytest', 'tests/integration/redis_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('requests', ('>=2.0,<2.1', '>=2.10,<2.11', '>=2.11,<2.12', '>=2.12,<2.13',
+                              '>=2.13,<2.14', '>=2.14,<2.15', '>=2.15,<2.16', '>=2.16,<2.17',
+                              '>=2.17,<2.18', '>=2.18,<2.19', '>=2.19,<2.20', '>=2.20,<2.21',
+                              '>=2.21,<2.22', '>=2.1,<2.2', '>=2.2,<2.3', '>=2.3,<2.4',
+                              '>=2.4,<2.5', '>=2.5,<2.6', '>=2.6,<2.7', '>=2.7,<2.8',
+                              '>=2.8,<2.9', '>=2.9,<2.10'))
+def requests_via_extras(session, requests):
+    install_unit_tests(session, f'requests{requests}', 'docker', '.[requests]')
+    session.run('pytest', 'tests/unit/libraries/requests_')
+    session.run('pytest', 'tests/integration/requests_')
+
+
+@nox.session(python=('2.7', '3.4', '3.5', '3.6'), reuse_venv=True)
+@nox.parametrize('tornado', ('>=4.3,<4.4', '>=4.4,<4.5', '>=4.5,<5.0', '>=5.0,<5.1', '>=5.1,<5.2'))
+def tornado_via_extras(session, tornado):
+    install_unit_tests(session, f'tornado{tornado}', 'requests', '.[tornado]')
+    session.run('pytest', 'tests/unit/libraries/tornado_')
+    session.run('pytest', 'tests/integration/tornado_')