test urllib3 master branch
diff --git a/.travis.yml b/.travis.yml
index efb75dd..fe24810 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,32 +11,46 @@
jobs:
include:
- stage: test
+ name: "Python 2.7"
script:
- make test-readme
- make ci
python: '2.7'
- stage: test
+ name: "Python 3.4"
script:
- make test-readme
- make ci
python: '3.4'
- stage: test
+ name: "Python 3.5"
script:
- make test-readme
- make ci
python: '3.5'
- stage: test
+ name: "Python 3.6"
script:
- make test-readme
- make ci
python: '3.6'
- stage: test
+ name: "Python 3.7"
script:
- make test-readme
- make ci
python: '3.7'
dist: xenial
- sudo: true
+ sudo: true
+ - stage: upstream compatibility
+ name: "urllib3"
+ script:
+ - make ci-dev
+ python: '3.7'
+ dist: xenial
+ sudo: true
+ allow_failures: true
- stage: coverage
+ name: "Coverage Test"
python: 3.6
script: codecov
diff --git a/Makefile b/Makefile
index 317a7c7..1b11788 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: docs
+.PHONY: docs ci-dev
init:
pip install pipenv --upgrade
pipenv install --dev --skip-lock
@@ -8,6 +8,10 @@
ci:
pipenv run py.test -n 8 --boxed --junitxml=report.xml
+ci-dev:
+ pip install git+https://github.com/urllib3/urllib3.git
+ $(MAKE) ci
+
test-readme:
@pipenv run python setup.py check --restructuredtext --strict && ([ $$? -eq 0 ] && echo "README.rst and HISTORY.rst ok") || echo "Invalid markup in README.rst or HISTORY.rst!"
@@ -25,4 +29,4 @@
docs:
cd docs && make html
- @echo "\033[95m\n\nBuild successful! View the docs homepage at docs/_build/html/index.html.\n\033[0m"
\ No newline at end of file
+ @echo "\033[95m\n\nBuild successful! View the docs homepage at docs/_build/html/index.html.\n\033[0m"
