Simplify tox config, run tox on CI.

edenhill · edenhill · commit 0b894418be95 · 2020-10-27T09:03:50.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,6 +22,7 @@ install:
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   - python --version
   - python -m pip install -U pip
+  - python -m pip install -U -r tests/requirements.txt
 
 build_script:
   - tools/windows-build.bat
diff --git a/.travis.yml b/.travis.yml
@@ -3,31 +3,31 @@ env:
   - LIBRDKAFKA_VERSION=v1.5.2
 jobs:
  include:
-  # Source package verification with Python 2.7
-  - os: linux
+  - name: "Source package verification with Python 2.7 (Linux)"
+    os: linux
     language: python
     dist: trusty
     python: "2.7"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib"
-  # Source package verification with Python 3.6
-  - os: linux
+  - name: "Source package verification with Python 3.6 (Linux)"
+    os: linux
     language: python
     dist: trusty
     python: "3.6"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib"
-  # Source package verification with Python 2.7
-  - os: osx
+  - name: "Source package verification with Python 2.7 (OSX)"
+    os: osx
     python: "2.7"
     env: DYLD_LIBRARY_PATH="$PWD/tmp-build/lib" INTERPRETER_VERSION="2.7.17"
-  # Source package verification with Python 3.6
-  - os: osx
+  - name: "Source package verification with Python 3.6 (OSX) +docs"
+    os: osx
     python: "3.6"
     env: DYLD_LIBRARY_PATH="$PWD/tmp-build/lib" MK_DOCS="y" INTERPRETER_VERSION="3.6.5"
-  # cibuildwheel for osx
-  - os: osx
+  - name: "cibuildwheel (OSX)"
+    os: osx
     env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib" INTERPRETER_VERSION="2.7.17"
-  # cibuildwheel for manylinux
-  - os: linux
+  - name: "cibuildwheel (manylinux)"
+    os: linux
     dist: trusty
     env:
       - CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh ${LIBRDKAFKA_VERSION}"
@@ -53,22 +53,20 @@ before_install:
 install:
  - tools/install-interceptors.sh
  - pip install -r tests/requirements.txt
+ - pip install tox
  - flake8
  - if [[ $MK_DOCS == y ]]; then pip install -r docs/requirements.txt; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp-build && pip install --global-option=build_ext --global-option="-Itmp-build/include/" --global-option="-Ltmp-build/lib" . .[avro]; fi
 
 # Build wheels
-script:
- - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse1 && tools/fixup-wheels.sh wheelhouse1 wheelhouse; fi
-
 # Make plugins available for tests
 # Execute tests if not CIBW_BEFORE_BUILD [osx, linux]
 # Execute integration tests if CIBW_BEFORE_BUILD
 # Build docs if MK_DOCS
-after_script:
+script:
+ - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse1 && tools/fixup-wheels.sh wheelhouse1 wheelhouse; fi
  - ldd staging/libs/* || otool -L staging/libs/* || true
- - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME == "osx" ]]; then DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs py.test --timeout=60 --ignore=tmp-build --import-mode append; fi
- - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME == "linux" ]]; then LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs py.test --timeout=60 --ignore=tmp-build --import-mode append; fi
+ - [[ -n $CIBW_BEFORE_BUILD ]] || LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs tox
  - if [[ -n $TRAVIS_TAG && $TRAVIS_OS_NAME == osx && -n $CIBW_BEFORE_BUILD ]]; then tools/test-wheel.sh wheelhouse; fi
  - if [[ $MK_DOCS == y ]]; then make docs; fi
 
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -28,6 +28,7 @@
 def kafka_cluster():
 
     cluster = TrivupFixture({'with_sr': True,
+                             'cp_version': 'latest',
                              'broker_conf': ['transaction.state.log.replication.factor=1',
                                              'transaction.state.log.min.isr=1']})
     try:
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,6 +1,6 @@
- flake8
- pytest==4.6.9;python_version<="3.0"
- pytest;python_version>="3.0"
- pytest-timeout
- requests-mock
- trivup
+flake8
+pytest==4.6.9;python_version<="3.0"
+pytest>=6.0.0;python_version>="3.0"
+pytest-timeout
+requests-mock
+trivup>=0.8.2
diff --git a/tools/windows-build.bat b/tools/windows-build.bat
@@ -51,14 +51,12 @@ for %%W in (wheelhouse\confluent_kafka-*cp%PYTHON_SHORTVER%*win*%PYTHON_ARCH%.wh
   python -c "import struct; print(struct.calcsize('P') * 8)"
   7z l %%~W
   pip install %%~W || exit /b 1
+  pip install -r src\confluent_kafka\requirements.txt
+  pip install -r src\confluent_kafka\avro\requirements.txt
 
-  SET savedir=%cd%
-  cd ..
   python -c "from confluent_kafka import libversion ; print(libversion())" || exit /b 1
 
-  python -m pytest --ignore=confluent-kafka-python\tests\schema_registry --ignore=confluent-kafka-python\tests\integration --import-mode=append confluent-kafka-python\tests || exit /b 1
+  python -m pytest --ignore=tests\schema_registry --ignore=tests\integration tests || exit /b 1
   pip uninstall -y confluent_kafka || exit /b 1
-
-  cd %savedir%
 )
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,py27,py34,py35,py36
+envlist = flake8,py27,py36,py38
 
 [testenv]
 setenv =
@@ -11,38 +11,18 @@ passenv =
     #http://tox.readthedocs.io/en/latest/config.html#confval-passenv=SPACE-SEPARATED-GLOBNAMES
     *
 commands =
-    pip install -v .
-    py.test -v --timeout 60 --ignore=tmp-build --import-mode append {posargs}
+    # Install main package and all sub-packages
+    pip install . .[avro] .[schema-registry] .[json] .[protobuf]
+    # Early verification that module is loadable
+    python -c 'import confluent_kafka ; print(confluent_kafka.version())'
+    # Run tests (large timeout to allow docker image downloads)
+    python -m pytest --timeout 600 --ignore=tmp-build {posargs}
     # See tests/README.md for additional notes on testing
-    python tests/integration/integration_test.py
+    #python tests/integration/integration_test.py
 
-[base]
 deps =
     # https://docs.pytest.org/en/latest/changelog.html#id53
-    pytest==4.6.4
-    pytest-timeout
-    fastavro
-    requests
-
-[testenv:py27]
-deps =
-    {[base]deps}
-    avro
-
-[testenv:py34]
-deps =
-    {[base]deps}
-    avro-python3
-
-[testenv:py35]
-deps =
-    {[base]deps}
-    avro-python3
-
-[testenv:py36]
-deps =
-    {[base]deps}
-    avro-python3
+    -rtests/requirements.txt
 
 [testenv:flake8]
 deps = flake8
