Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix windows build (#1044) 

* Fix requirements for CI.

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

* Fix apicheck job.
This commit is contained in:
Omer Katz 2019-05-15 21:37:18 +03:00 committed by Asif Saif Uddin
parent a3e6f5f53f
commit e83f1c5371
5 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -19,7 +19,7 @@ matrix:
- python: 3.6 - python: 3.6
env: TOXENV=3.6 env: TOXENV=3.6
- python: 3.7 - python: 3.7
env: TOXENV=3.7 env: TOXENV=3.7-linux
sudo: true sudo: true
dist: xenial dist: xenial
before_install: sudo apt-get update && sudo apt-get install libgnutls-dev before_install: sudo apt-get update && sudo apt-get install libgnutls-dev

4
appveyor.yml
View File

@ -21,7 +21,7 @@ environment:
PYTHON_VERSION: "3.6.x" PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
- TOXENV: "3.7" - TOXENV: "3.7-windows"
TOX_APPVEYOR_X64: 0 TOX_APPVEYOR_X64: 0
PYTHON_VERSION: "3.7.x" PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
@ -44,7 +44,7 @@ environment:
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
WINDOWS_SDK_VERSION: "v7.1" WINDOWS_SDK_VERSION: "v7.1"
- TOXENV: "3.7" - TOXENV: "3.7-windows"
TOX_APPVEYOR_X64: 1 TOX_APPVEYOR_X64: 1
PYTHON_VERSION: "3.7.x" PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"

14
requirements/test-ci-windows.txt Normal file
View File

@ -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

8
requirements/test-ci.txt
View File

@ -1,9 +1,9 @@
pytest-cov pytest-cov
pytest-travis-fold pytest-travis-fold
codecov codecov
redis -r extras/redis.txt
PyYAML -r extras/yaml.txt
msgpack-python>0.2.0 -r extras/msgpack.txt
-r extras/azureservicebus.txt -r extras/azureservicebus.txt
-r extras/azurestoragequeues.txt -r extras/azurestoragequeues.txt
-r extras/sqs.txt -r extras/sqs.txt
@ -12,4 +12,4 @@ msgpack-python>0.2.0
-r extras/zookeeper.txt -r extras/zookeeper.txt
-r extras/brotli.txt -r extras/brotli.txt
-r extras/zstd.txt -r extras/zstd.txt
sqlalchemy -r extras/sqlalchemy.txt

13
tox.ini
View File

@ -3,10 +3,9 @@ envlist =
2.7 2.7
pypy pypy
pypy3 pypy3
3.4
3.5 3.5
3.6 3.6
3.7 3.7-{linux,windows}
flake8 flake8
flakeplus flakeplus
apicheck apicheck
@ -18,11 +17,11 @@ setenv = C_DEBUG_TEST = 1
passenv = passenv =
DISTUTILS_USE_SDK DISTUTILS_USE_SDK
deps= deps=
-r{toxinidir}/requirements/default.txt apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.7-windows: -r{toxinidir}/requirements/default.txt
-r{toxinidir}/requirements/test.txt apicheck,2.7,pypy,pypy3,3.5,3.6,3.7-linux,3.7-windows: -r{toxinidir}/requirements/test.txt
-r{toxinidir}/requirements/test-ci.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
2.7,pypy,cov: -r{toxinidir}/requirements/test-ci-py2.txt 3.7-windows: -r{toxinidir}/requirements/test-ci-windows.txt
apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt