From e83f1c537166b018e3ada0241c4471798edf79b0 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Wed, 15 May 2019 21:37:18 +0300
Subject: [PATCH] Fix windows build (#1044)

* Fix requirements for CI.

* Try to skip PyCurl on Windows CI when testing 3.7.

* Fix apicheck job.
---
 .travis.yml                      |  2 +-
 appveyor.yml                     |  4 ++--
 requirements/test-ci-windows.txt | 14 ++++++++++++++
 requirements/test-ci.txt         |  8 ++++----
 tox.ini                          | 13 ++++++-------
 5 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 requirements/test-ci-windows.txt

diff --git a/.travis.yml b/.travis.yml
index f4d49af7..fedfd6a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     - python: 3.6
       env: TOXENV=3.6
     - python: 3.7
-      env: TOXENV=3.7
+      env: TOXENV=3.7-linux
       sudo: true
       dist: xenial
       before_install: sudo apt-get update && sudo apt-get install libgnutls-dev
diff --git a/appveyor.yml b/appveyor.yml
index a5d54e35..a998d943 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,7 @@ environment:
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "32"
 
-    - TOXENV: "3.7"
+    - TOXENV: "3.7-windows"
       TOX_APPVEYOR_X64: 0
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "32"
@@ -44,7 +44,7 @@ environment:
       PYTHON_ARCH: "64"
       WINDOWS_SDK_VERSION: "v7.1"
 
-    - TOXENV: "3.7"
+    - TOXENV: "3.7-windows"
       TOX_APPVEYOR_X64: 1
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
diff --git a/requirements/test-ci-windows.txt b/requirements/test-ci-windows.txt
new file mode 100644
index 00000000..264b39ca
--- /dev/null
+++ b/requirements/test-ci-windows.txt
@@ -0,0 +1,14 @@
+pytest-cov
+pytest-travis-fold
+codecov
+-r extras/redis.txt
+-r extras/yaml.txt
+-r extras/msgpack.txt
+-r extras/azureservicebus.txt
+-r extras/azurestoragequeues.txt
+-r extras/consul.txt
+-r extras/librabbitmq.txt
+-r extras/zookeeper.txt
+-r extras/brotli.txt
+-r extras/zstd.txt
+-r extras/sqlalchemy.txt
diff --git a/requirements/test-ci.txt b/requirements/test-ci.txt
index 7bd404c3..a47c4500 100644
--- a/requirements/test-ci.txt
+++ b/requirements/test-ci.txt
@@ -1,9 +1,9 @@
 pytest-cov
 pytest-travis-fold
 codecov
-redis
-PyYAML
-msgpack-python>0.2.0
+-r extras/redis.txt
+-r extras/yaml.txt
+-r extras/msgpack.txt
 -r extras/azureservicebus.txt
 -r extras/azurestoragequeues.txt
 -r extras/sqs.txt
@@ -12,4 +12,4 @@ msgpack-python>0.2.0
 -r extras/zookeeper.txt
 -r extras/brotli.txt
 -r extras/zstd.txt
-sqlalchemy
+-r extras/sqlalchemy.txt
diff --git a/tox.ini b/tox.ini
index b8080c1c..7acc221d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,10 +3,9 @@ envlist =
     2.7
     pypy
     pypy3
-    3.4
     3.5
     3.6
-    3.7
+    3.7-{linux,windows}
     flake8
     flakeplus
     apicheck
@@ -18,11 +17,11 @@ setenv = C_DEBUG_TEST = 1
 passenv =
   DISTUTILS_USE_SDK
 deps=
-    -r{toxinidir}/requirements/default.txt
-    -r{toxinidir}/requirements/test.txt
-    -r{toxinidir}/requirements/test-ci.txt
-
-    2.7,pypy,cov: -r{toxinidir}/requirements/test-ci-py2.txt
+    apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.7-windows: -r{toxinidir}/requirements/default.txt
+    apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.7-windows: -r{toxinidir}/requirements/test.txt
+    apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux: -r{toxinidir}/requirements/test-ci.txt
+    2.7,pypy: -r{toxinidir}/requirements/test-ci-py2.txt
+    3.7-windows: -r{toxinidir}/requirements/test-ci-windows.txt
 
     apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt