summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmer Katz <omer.drow@gmail.com>2020-08-30 18:42:20 +0300
committerAsif Saif Uddin <auvipy@gmail.com>2020-08-31 14:05:09 +0600
commit7131ad6d9cf2b00a70d57915066ebd5915a4e13c (patch)
tree8205fbff69e6d186f41ed4879720cf6f2255c4c1
parente404284bf0be8177e1100fadc323fecbe6cdc0e4 (diff)
downloadpy-amqp-7131ad6d9cf2b00a70d57915066ebd5915a4e13c.tar.gz
CI for Python 3 only.
-rw-r--r--.travis.yml19
-rw-r--r--appveyor.yml12
-rw-r--r--tox.ini11
3 files changed, 17 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml
index 8dd2a6f..6aef248 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,12 @@
language: python
sudo: required
-dist: xenial
+dist: bionic
cache: pip
python:
- - '3.5'
- '3.6'
- '3.7'
- '3.8'
- - 'pypy3.5-6.0'
+ - 'pypy3.6-7.3.1'
env:
global:
@@ -31,18 +30,15 @@ _integration_job: &integration_job
matrix:
fast_finish: true
include:
- - python: 3.7
+ - python: 3.8
env: TOXENV=flake8
stage: lint
- - python: 3.7
+ - python: 3.8
env: TOXENV=pydocstyle
stage: lint
- - python: 3.7
+ - python: 3.8
env: TOXENV=apicheck
stage: lint
- - python: 3.5
- <<: *integration_job
- env: MATRIX_TOXENV=integration-rabbitmq
- python: 3.6
<<: *integration_job
env: MATRIX_TOXENV=integration-rabbitmq
@@ -55,12 +51,9 @@ matrix:
services:
- docker
stage: integration
- - python: pypy3.5-6.0
+ - python: pypy3.6-7.3.1
<<: *integration_job
env: MATRIX_TOXENV=integration-rabbitmq
- - python: 3.5
- <<: *integration_job
- env: MATRIX_TOXENV=integration-rabbitmq CELERY_ENABLE_SPEEDUPS=1
- python: 3.6
<<: *integration_job
env: MATRIX_TOXENV=integration-rabbitmq CELERY_ENABLE_SPEEDUPS=1
diff --git a/appveyor.yml b/appveyor.yml
index 29c233a..bb9de48 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,21 @@
environment:
matrix:
- - TOXENV: "3.5"
+ - TOXENV: "3.6-unit"
TOX_APPVEYOR_X64: 0
- - TOXENV: "3.6"
+ - TOXENV: "3.7-unit"
TOX_APPVEYOR_X64: 0
- - TOXENV: "3.7"
+ - TOXENV: "3.8-unit"
TOX_APPVEYOR_X64: 0
- - TOXENV: "3.5"
+ - TOXENV: "3.6-unit"
TOX_APPVEYOR_X64: 1
- - TOXENV: "3.6"
+ - TOXENV: "3.7-unit"
TOX_APPVEYOR_X64: 1
- - TOXENV: "3.7"
+ - TOXENV: "3.8-unit"
TOX_APPVEYOR_X64: 1
build: off
diff --git a/tox.ini b/tox.ini
index d1d7bd6..ecc86e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
envlist =
- {pypy3.5-6.0,3.5,3.6,3.7,3.8}-unit
- {pypy3.5-6.0,3.5,3.6,3.7,3.8}-integration-rabbitmq
+ {pypy3.6-7.3.1,3.6,3.7,3.8}-unit
+ {pypy3.6-7.3.1,3.6,3.7,3.8}-integration-rabbitmq
flake8
flakeplus
apicheck
@@ -22,9 +22,8 @@ commands =
unit: py.test -xv --cov=amqp --cov-report=xml --no-cov-on-fail t/unit
integration: py.test -xv -E rabbitmq t/integration {posargs:-n2}
basepython =
- flake8,apicheck,linkcheck,pydocstyle: python3.7
- pypy3.5-6.0: pypy
- 3.5: python3.5
+ flake8,apicheck,linkcheck,pydocstyle: python3.8
+ pypy3.6-7.3.1: pypy
3.6: python3.6
3.7: python3.7
3.8: python3.8
@@ -33,7 +32,7 @@ commands_pre =
integration-rabbitmq: ./wait_for_rabbitmq.sh
docker =
integration-rabbitmq: rabbitmq:tls
-dockerenv =
+dockerenv =
PYAMQP_INTEGRATION_INSTANCE=1
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit tcp_listeners [5672]