From 9f6ee74d1a562caf91ee804e3ae7cca2b4e0fd97 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Tue, 15 Oct 2019 22:07:03 +0300
Subject: [PATCH 1/3] Test on Python 3.8 final
---
.travis.yml | 14 +++++---------
tox.ini | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c61e41702be..97520682ab7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: python
cache: pip
dist: xenial
-python: 3.7
+python: 3.8
addons:
apt:
packages:
@@ -38,6 +38,10 @@ jobs:
- env: GROUP=2
python: pypy2.7-6.0
# Other Supported CPython
+ - env: GROUP=1
+ python: 3.7
+ - env: GROUP=2
+ python: 3.7
- env: GROUP=1
python: 3.6
- env: GROUP=2
@@ -47,15 +51,7 @@ jobs:
- env: GROUP=2
python: 3.5
- - env: GROUP=1
- python: 3.8-dev
- - env: GROUP=2
- python: 3.8-dev
-
fast_finish: true
- # It's okay to fail on the in-development CPython version.
- allow_failures:
- - python: 3.8-dev
before_install: tools/travis/setup.sh
install: travis_retry tools/travis/install.sh
diff --git a/tox.ini b/tox.ini
index eb06dbddaea..30eb193dd3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report
[testenv:docs]
# Don't skip install here since pip_sphinxext uses pip's internals.
deps = -r{toxinidir}/tools/requirements/docs.txt
-basepython = python3.7
+basepython = python3.8
commands =
sphinx-build -W -d {envtmpdir}/doctrees/html -b html docs/html docs/build/html
# Having the conf.py in the docs/html is weird but needed because we
From 125f483675dc0619da4f751d3e41c04bc43339c9 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 4 Nov 2019 23:16:06 +0200
Subject: [PATCH 2/3] Test Python 3.8 on GHA
---
.github/workflows/python-linters.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/python-linters.yml b/.github/workflows/python-linters.yml
index 705dea44db2..6e14c5e9dd9 100644
--- a/.github/workflows/python-linters.yml
+++ b/.github/workflows/python-linters.yml
@@ -22,10 +22,10 @@ jobs:
- TOXENV: lint
steps:
- uses: actions/checkout@master
- - name: Set up Python ${{ matrix.env.PYTHON_VERSION || 3.7 }}
+ - name: Set up Python ${{ matrix.env.PYTHON_VERSION || 3.8 }}
uses: actions/setup-python@v1
with:
- python-version: ${{ matrix.env.PYTHON_VERSION || 3.7 }}
+ python-version: ${{ matrix.env.PYTHON_VERSION || 3.8 }}
- name: Pre-configure global Git settings
run: >-
tools/travis/setup.sh
From 8ab7d239fadaa8bd35980b6412000643f5a39232 Mon Sep 17 00:00:00 2001
From: Chris Hunt <chrahunt@gmail.com>
Date: Tue, 26 Nov 2019 21:36:40 -0500
Subject: [PATCH 3/3] Use pip 19.3.1+ for vendoring task
---
tox.ini | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tox.ini b/tox.ini
index 30eb193dd3d..de1263fc47c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,6 +53,9 @@ commands_pre =
deps =
invoke
requests
+ # Required, otherwise we interpret --no-binary :all: as
+ # "do not build wheels", which fails for PEP 517 requirements
+ pip>=19.3.1
whitelist_externals = git
commands =
# Check that the vendoring is up-to-date