AppVeyor: Verify both py2 and py3, and fix builds.

edenhill · edenhill · commit 55390dda9180 · 2020-04-01T17:48:43.000+02:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -2,11 +2,26 @@ environment:
   global:
     LIBRDKAFKA_NUGET_VERSION: 1.4.0-RC7
     CIBW_SKIP: cp33-* cp34-*
-    CIBW_TEST_REQUIRES: pytest pytest-timeout requests avro trivup
+    CIBW_TEST_REQUIRES: pytest pytest-timeout requests trivup
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\tools\\appveyor\\run_with_env.cmd"
+  matrix:
+   - PYTHON: "C:\\Python27-x64"
+     PYTHON_VERSION: "2.7.17"
+     PYTHON_SHORTVER: "27"
+     PYTHON_ARCH: "64"
+   - PYTHON: "C:\\Python36-x64"
+     PYTHON_VERSION: "3.6.8"
+     PYTHON_SHORTVER: "36"
+     PYTHON_ARCH: "64"
+     WHEEL_UPLOAD: true
+
+install:
+  - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  - python --version
+  - python -m pip install -U pip
 
 build_script:
   - tools/windows-build.bat
@@ -28,3 +43,4 @@ deploy:
   max_error_retry: 3
   on:
     APPVEYOR_REPO_TAG: true
+    WHEEL_UPLOAD: true
diff --git a/tools/windows-build.bat b/tools/windows-build.bat
@@ -10,6 +10,7 @@ set
 rem Download and install librdkafka from NuGet.
 call tools\windows-install-librdkafka.bat %LIBRDKAFKA_NUGET_VERSION% dest || exit /b 1
 
+pip install -U -r tests/requirements.txt -r confluent_kafka/avro/requirements.txt
 pip install cibuildwheel==0.12.0 || exit /b 1
 
 rem Build wheels (without tests)
@@ -46,16 +47,18 @@ for %%W in (..\..\wheelhouse\*amd64.whl) do (
 cd ..\..
 
 rem Basic testing
-for %%W in (wheelhouse\confluent_kafka-*cp27*win32.whl) do (
+for %%W in (wheelhouse\confluent_kafka-*cp%PYTHON_SHORTVER%*win*%PYTHON_ARCH%.whl) do (
   python -c "import struct; print(struct.calcsize('P') * 8)"
   7z l %%~W
   pip install %%~W || exit /b 1
+
+  SET savedir=%cd%
   cd ..
-  python -c "from confluent_kafka import libversion ; print libversion()" || exit /b 1
-  cd confluent-kafka-python
+  python -c "from confluent_kafka import libversion ; print(libversion())" || exit /b 1
 
-  pytest --ignore=tests\integration --import-mode=append tests || 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
   pip uninstall -y confluent_kafka || exit /b 1
 
+  cd %savedir%
 )
 
