wi0

Author: untitaker

.travis.yml

@@ -32,7 +32,7 @@ matrix:
       dist: xenial
       install:
         - pip install tox
-      script: tox -e linters
+      script: nox -s linters
 
     - python: "3.8"
       dist: xenial
@@ -54,14 +54,14 @@ services:
   - postgresql
 
 install:
-  - pip install tox
+  - bash scripts/travis-install-nox.sh
   - pip install codecov
   - make install-zeus-cli
   - bash scripts/download-relay.sh
 
 script:
   - coverage erase
-  - ./scripts/runtox.sh '' --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+  - nox -s travis_test -- --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
   - coverage combine .coverage*
   - coverage xml -i
   - codecov --file coverage.xml

noxfile.py

@@ -4,9 +4,11 @@
 import braceexpand
 import itertools
 
+from tox.config import _split_factor_expr
+
 MAX_JOBS = 50
 
-def expand_factors(value):
+def expand_envlist(value):
     for line in value.splitlines():
         line = line.strip()
 
@@ -18,65 +20,117 @@ def expand_factors(value):
 
 
 def find_dependencies(deps, env):
-    parts = env.split("-")
-
-    for combo in itertools.product((True, False), repeat=len(parts)):
-        key = "-".join(parts[i] for i, include in enumerate(combo) if include)
-
-        if key in deps:
-            yield deps[key]
+    env_factors = set(env.split("-"))
+    for (matcher, dependency) in deps.items():
+        for (included, excluded) in _split_factor_expr(matcher):
+            if included <= env_factors and not env_factors & excluded:
+                yield dependency
 
 def parse_tox():
     config = configparser.ConfigParser()
     config.read("tox.ini")
 
     dependencies = {}
 
-    for declaration in expand_factors(config['testenv']['deps']):
-        if declaration.startswith("-r "):
+    for line in config['testenv']['deps'].splitlines():
+        line = line.strip()
+        if not line or line.startswith(("-r", "#")):
             continue
 
-        env_matcher, dependency = declaration.split(":", 1)
+        env_matcher, dependency = line.split(":", 1)
         dependencies[env_matcher.strip()] = dependency
 
-    jobs = {}
+    batch_jobs = {}
+    single_jobs = []
 
-    for env in expand_factors(config['tox']['envlist']):
+    for env in expand_envlist(config['tox']['envlist']):
         python_version, integration, framework_version, *_ = (
             list(env.split("-")) + [None, None]
         )
 
-        python_version_jobs = jobs.setdefault(python_version, [])
-        for job in python_version_jobs:
-            if job.setdefault(integration, framework_version) == framework_version:
-                break
+        python_version_jobs = batch_jobs.setdefault(python_version, [])
+
+        if integration is None:
+            python_version_jobs.append({})
         else:
-            python_version_jobs.append({integration: framework_version})
+            for job in python_version_jobs:
+                if job and job.setdefault(integration, framework_version) == framework_version:
+                    break
+            else:
+                python_version_jobs.append({integration: framework_version})
+
+        single_jobs.append((python_version, integration, framework_version))
 
-    return dependencies, jobs
+    return dependencies, batch_jobs, single_jobs
 
 
-def generate_sessions(_locals):
-    dependencies, jobs = parse_tox()
+def _format_job_name(python_version, integration, framework_version):
+    if integration is not None:
+        return f"{python_version}-{integration}-{framework_version}"
+    else:
+        return f"{python_version}"
+
+
+def generate_test_sessions():
+    dependencies, batch_jobs, single_jobs = parse_tox()
+
+    def add_nox_job(job_name, integrations, python_version, deps):
+        job_name = job_name.replace(".", "").replace("-", "_")
+
+        def func(session):
+            session.install("-e", ".")
+            session.install("-r", "test-requirements.txt", *deps)
+            session.env['COVERAGE_FILE'] = f'.coverage-{job_name}'
+            session.run(
+                "pytest",
+                *[f"tests/integrations/{integration}" for integration in integrations],
+                *session.posargs
+            )
 
-    for python_version, batches in jobs.items():
+        assert python_version.startswith("py")
+        nox_python_version = "pypy" if python_version == "pypy" else python_version[2:]
+
+        globals()[job_name] = nox.session(
+            func=func, reuse_venv=True, python=nox_python_version, name=job_name
+        )
+
+    for (python_version, integration, framework_version) in single_jobs:
+        job_name = _format_job_name(python_version,integration,framework_version)
+        deps = list(find_dependencies(dependencies, job_name))
+
+        add_nox_job(f"test-{job_name}", [integration], python_version, deps)
+
+    for python_version, batches in batch_jobs.items():
         for batch_name, integrations in enumerate(batches):
-            job_name = f"{python_version}-{batch_name}"
+            job_name = f"batchtest-{python_version}-{batch_name}"
             deps = []
-            for integration, version in integrations.items():
+            for integration, framework_version in integrations.items():
                 deps.extend(find_dependencies(
-                    dependencies, f"{python_version}-{integration}-{version}"
+                    dependencies, 
+                    _format_job_name(python_version, integration, framework_version)
                 ))
 
-            def func(session, deps=deps):
-                session.install("-r", "test-requirements.txt", *deps)
+            add_nox_job(job_name, integrations, python_version, deps)
 
-            assert python_version.startswith("py")
-            nox_python_version = "pypy" if python_version == "pypy" else python_version[2:]
 
-            _locals[job_name] = nox.session(
-                func=func, reuse_venv=True, python=nox_python_version, name=job_name
-            )
+@nox.session(python="3.8")
+def linters(session):
+    session.install("-r", "linter-requirements.txt")
+
+    session.run(*"flake8 tests examples sentry_sdk".split())
+    session.run(*"black --check tests examples sentry_sdk".split())
+    session.run(*"mypy examples sentry_sdk".split())
+
+
+import os
+travis_python = os.environ.get("TRAVIS_PYTHON_VERSION")
+
+if travis_python:
+    @nox.session(python=travis_python)
+    def travis_test(session):
+        for name, f in globals().items():
+            if name.startswith(f"test-{travis_python}"):
+                f(session)
 
 
-generate_sessions(locals())
+generate_test_sessions()

scripts/runnox.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -ex
+
+if [ -n "$NOXPATH" ]; then
+    true
+elif which nox &> /dev/null; then
+    NOXPATH=nox
+else
+    NOXPATH=./.venv/bin/nox
+fi
+
+# Usage: sh scripts/runtox.sh py3.7 <pytest-args>
+# Runs all environments with substring py3.7 and the given arguments for pytest
+
+if [ -n "$1" ]; then
+    searchstring="$1"
+elif [ -n "$TRAVIS_PYTHON_VERSION" ]; then
+    searchstring="$(echo py$TRAVIS_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
+elif [ -n "$AZURE_PYTHON_VERSION" ]; then
+    searchstring="$(echo py$AZURE_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
+    if [ "$searchstring" = pypy2 ]; then
+        searchstring=pypy
+    fi
+fi
+
+exec $NOXPATH -k "$searchstring"

scripts/travis-install-nox.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -exo pipefail
+
+# Linux Setup
+# Even when testing on Python 2, we need Python 3 for Nox. This detects if
+# we're in one of the Travis Python 2 sessions and sets up the Python 3 install
+# for Nox.
+# Taken from urllib3/urllib3
+if ! python3 -m pip --version; then
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    sudo python3 get-pip.py
+    # https://github.com/theacodes/nox/issues/328
+    sudo python3 -m pip install nox==2019.11.9
+else
+    # We're not in "dual Python" mode, so we can just install Nox normally.
+    python3 -m pip install nox
+fi

tox.ini

@@ -56,8 +56,8 @@ envlist =
     {py3.7,py3.8}-tornado-{5,6}
 
     {py3.4,py3.5,py3.6,py3.7,py3.8}-trytond-{4.6,4.8,5.0}
-    {py3.5,py3.6,py3.7,py3.8}-trytond-{5.2}
-    {py3.6,py3.7,py3.8}-trytond-{5.4}
+    {py3.5,py3.6,py3.7,py3.8}-trytond-5.2
+    {py3.6,py3.7,py3.8}-trytond-5.4
 
     {py2.7,py3.8}-requests
 
@@ -98,6 +98,7 @@ deps =
     django-dev: git+https://github.com/django/django.git#egg=Django
 
     flask: flask-login
+    flask: blinker>=1.1
     flask-0.11: Flask>=0.11,<0.12
     flask-0.12: Flask>=0.12,<0.13
     flask-1.0: Flask>=1.0,<1.1
@@ -220,10 +221,6 @@ passenv =
     SENTRY_PYTHON_TEST_POSTGRES_USER
     SENTRY_PYTHON_TEST_POSTGRES_NAME
 usedevelop = True
-extras =
-    flask: flask
-    bottle: bottle
-    falcon: falcon
 
 basepython =
     py2.7: python2.7