Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to Python 3.8.2 #7828

Merged
merged 9 commits into from Apr 22, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .python-version
@@ -1 +1 @@
3.7.3
3.8.2
5 changes: 3 additions & 2 deletions .travis.yml
@@ -1,11 +1,11 @@
language: python
python: 3.7.3
python: 3.8.2

env:
global:
- TRAVIS_NODE_VERSION=10.19.0

dist: xenial
dist: bionic

addons:
hosts:
Expand All @@ -31,6 +31,7 @@ install:
- nvm install $TRAVIS_NODE_VERSION
- pip install -U pip setuptools wheel
- pip install -r requirements/main.txt -r requirements/deploy.txt -r requirements/docs.txt -r requirements/lint.txt -r requirements/tests.txt
- pip install -r requirements/dev.txt
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm honestly not exactly sure what changed that required this, it seems pip-tools was being installed some other way before, might relate to bumping travis dist to bionic

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also while tracking this down I noticed that in CI we are installing everything into the virtualenv travis automatically creates for us, but then reinstalling it into the .state/env we construct... but never use.

- npm i -g npm
- npm install -g gulp-cli
- npm ci
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Expand Up @@ -45,7 +45,7 @@ RUN gulp dist

# Now we're going to build our actual application, but not the actual production
# image that it gets deployed into.
FROM python:3.7.3-slim-stretch as build
FROM python:3.8.2-slim-buster as build

# Define whether we're building a production or a development image. This will
# generally be used to control whether or not we install our development and
Expand Down Expand Up @@ -121,7 +121,7 @@ RUN set -x \

# Now we're going to build our actual application image, which will eventually
# pull in the static files that were built above.
FROM python:3.7.3-slim-stretch
FROM python:3.8.2-slim-buster

# Setup some basic environment variables that are ~never going to change.
ENV PYTHONUNBUFFERED 1
Expand All @@ -146,7 +146,7 @@ RUN set -x \
RUN set -x \
&& apt-get update \
&& apt-get install --no-install-recommends -y \
libpq5 libxml2 libxslt1.1 libcurl3 \
libpq5 libxml2 libxslt1.1 libcurl4 \
$(if [ "$DEVEL" = "yes" ]; then echo 'bash libjpeg62 postgresql-client'; fi) \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -53,9 +53,9 @@ default:
@exit 1

.state/env/pyvenv.cfg: requirements/dev.txt requirements/docs.txt requirements/lint.txt requirements/ipython.txt
# Create our Python 3.7 virtual environment
# Create our Python 3.8 virtual environment
rm -rf .state/env
python3.7 -m venv .state/env
python3.8 -m venv .state/env

# install/upgrade general requirements
.state/env/bin/python -m pip install --upgrade pip setuptools wheel
Expand Down
2 changes: 1 addition & 1 deletion docs/api-reference/legacy.rst
Expand Up @@ -120,7 +120,7 @@ The API endpoint served at `upload.pypi.org/legacy/
<https://upload.pypi.org/legacy/>`_ is Warehouse's emulation of the
legacy PyPI upload API. This is the endpoint that tools such as `twine
<https://twine.readthedocs.io/>`_ and `distutils
<https://docs.python.org/3.7/distutils/packageindex.html#the-upload-command>`_
<https://docs.python.org/3.8/distutils/packageindex.html#the-upload-command>`_
ewdurbin marked this conversation as resolved.
Show resolved Hide resolved
use to `upload distributions to PyPI
<https://packaging.python.org/tutorials/distributing-packages/>`_.

Expand Down
4 changes: 2 additions & 2 deletions docs/development/getting-started.rst
Expand Up @@ -581,12 +581,12 @@ Use :command:`make` to build the documentation. For example:
The HTML documentation index can now be found at
:file:`docs/_build/html/index.html`.

Building the docs requires Python 3.7. If it is not installed, the
Building the docs requires Python 3.8. If it is not installed, the
:command:`make` command will give the following error message:

.. code-block:: console

make: python3.7: Command not found
make: python3.8: Command not found
Makefile:53: recipe for target '.state/env/pyvenv.cfg' failed
make: *** [.state/env/pyvenv.cfg] Error 127

Expand Down
78 changes: 40 additions & 38 deletions requirements/main.txt
Expand Up @@ -294,10 +294,6 @@ idna==2.9 \
--hash=sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb \
--hash=sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa \
# via email-validator, requests
importlib-metadata==1.6.0 \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for this back port anymore!

--hash=sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f \
--hash=sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e \
# via kombu
itsdangerous==1.1.0 \
--hash=sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 \
--hash=sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749 \
Expand Down Expand Up @@ -724,44 +720,50 @@ yara-python==3.11.0 \
--hash=sha256:e4124414d3cff9a10669569a89f585f81c8114b283ab48b2e756e0347a89de0a \
--hash=sha256:f104f0bb21a0867f22e750bb4e05de629ec9f37facc84daf963385a86371b0d9 \
# via -r requirements/main.in
zipp==3.1.0 \
--hash=sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b \
--hash=sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96 \
# via importlib-metadata
zope.deprecation==4.3.0 \
--hash=sha256:7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224 \
--hash=sha256:c83cfef3085d10dcb07de5a59a2d95713865befa46e0e88784c5648610fba789 \
# via pyramid, pyramid-jinja2
zope.interface==4.6.0 \
--hash=sha256:086707e0f413ff8800d9c4bc26e174f7ee4c9c8b0302fbad68d083071822316c \
--hash=sha256:1157b1ec2a1f5bf45668421e3955c60c610e31913cc695b407a574efdbae1f7b \
--hash=sha256:11ebddf765bff3bbe8dbce10c86884d87f90ed66ee410a7e6c392086e2c63d02 \
--hash=sha256:14b242d53f6f35c2d07aa2c0e13ccb710392bcd203e1b82a1828d216f6f6b11f \
--hash=sha256:1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5 \
--hash=sha256:20a12ab46a7e72b89ce0671e7d7a6c3c1ca2c2766ac98112f78c5bddaa6e4375 \
--hash=sha256:298f82c0ab1b182bd1f34f347ea97dde0fffb9ecf850ecf7f8904b8442a07487 \
--hash=sha256:2f6175722da6f23dbfc76c26c241b67b020e1e83ec7fe93c9e5d3dd18667ada2 \
--hash=sha256:3b877de633a0f6d81b600624ff9137312d8b1d0f517064dfc39999352ab659f0 \
--hash=sha256:4265681e77f5ac5bac0905812b828c9fe1ce80c6f3e3f8574acfb5643aeabc5b \
--hash=sha256:550695c4e7313555549aa1cdb978dc9413d61307531f123558e438871a883d63 \
--hash=sha256:5f4d42baed3a14c290a078e2696c5f565501abde1b2f3f1a1c0a94fbf6fbcc39 \
--hash=sha256:62dd71dbed8cc6a18379700701d959307823b3b2451bdc018594c48956ace745 \
--hash=sha256:7040547e5b882349c0a2cc9b50674b1745db551f330746af434aad4f09fba2cc \
--hash=sha256:7e099fde2cce8b29434684f82977db4e24f0efa8b0508179fce1602d103296a2 \
--hash=sha256:7e5c9a5012b2b33e87980cee7d1c82412b2ebabcb5862d53413ba1a2cfde23aa \
--hash=sha256:81295629128f929e73be4ccfdd943a0906e5fe3cdb0d43ff1e5144d16fbb52b1 \
--hash=sha256:95cc574b0b83b85be9917d37cd2fad0ce5a0d21b024e1a5804d044aabea636fc \
--hash=sha256:968d5c5702da15c5bf8e4a6e4b67a4d92164e334e9c0b6acf080106678230b98 \
--hash=sha256:9e998ba87df77a85c7bed53240a7257afe51a07ee6bc3445a0bf841886da0b97 \
--hash=sha256:a0c39e2535a7e9c195af956610dba5a1073071d2d85e9d2e5d789463f63e52ab \
--hash=sha256:a15e75d284178afe529a536b0e8b28b7e107ef39626a7809b4ee64ff3abc9127 \
--hash=sha256:a6a6ff82f5f9b9702478035d8f6fb6903885653bff7ec3a1e011edc9b1a7168d \
--hash=sha256:b639f72b95389620c1f881d94739c614d385406ab1d6926a9ffe1c8abbea23fe \
--hash=sha256:bad44274b151d46619a7567010f7cde23a908c6faa84b97598fd2f474a0c6891 \
--hash=sha256:bbcef00d09a30948756c5968863316c949d9cedbc7aabac5e8f0ffbdb632e5f1 \
--hash=sha256:d788a3999014ddf416f2dc454efa4a5dbeda657c6aba031cf363741273804c6b \
--hash=sha256:eed88ae03e1ef3a75a0e96a55a99d7937ed03e53d0cffc2451c208db445a2966 \
--hash=sha256:f99451f3a579e73b5dd58b1b08d1179791d49084371d9a47baad3b22417f0317 \
zope.interface==4.7.2 \
ewdurbin marked this conversation as resolved.
Show resolved Hide resolved
--hash=sha256:34381fcecc6e6f57d72bc2fab6175976eeacdd61dbb34427a37b260238278199 \
--hash=sha256:4d0830e1d544b2c303064ec01923de2b9d6f5b5d0d78608a91d758b0f469361c \
--hash=sha256:73a618e734803ded8b8d8f14f9a6371c6a1acc445840cf6ae57733041e796671 \
--hash=sha256:a82d36ecc28e72904388f72f57f3c04aee7c43a019e302d61944b3886c261be3 \
--hash=sha256:b0029f193d91a1e0085e4a99dd71e4c63a3e7826ec4a8d2ea457f02e1b6b0bb4 \
--hash=sha256:2690fd5b042062d866017db11ce1e12d4862df28614cc2915dc57e52b46a8594 \
--hash=sha256:0616040d5a18786aff5d25ef6e1fa0f875b7ba5b6f1a923c1153be81dd9c65ad \
--hash=sha256:6f1e8914eee2e3a0bcf435d963ca5cf3a3df89a47cbd3e2b16343bc875194fed \
--hash=sha256:a41a34c55887743ee124e8f696217dec1a7eead1164d27ef27dfae528c396a23 \
--hash=sha256:d8a0cb84de725ccd6abd9b5bd32cb94a11db336076fb6d459f1fed23d0719e0c \
--hash=sha256:a36e7e1972109504dfa0995a89b6c24a990113eb4cedef93d0eaf1452901b6ac \
--hash=sha256:1033e7bb858c398580ca7cbb50f15b715e6031d5772f8a1bde4042c12300a52a \
--hash=sha256:ae6c4a1fa696c12c3b654fa0d160f3781271f0edbbb0ae50f285a91f2a272a09 \
--hash=sha256:64446f9baa2c51f47b0e272939c583ffd220e67f5bcbc2f18dd244c5a46a7018 \
--hash=sha256:a7b50fa86c1bd863ef3b3314da62928c015a732bb0aef220852b9606104f0df5 \
--hash=sha256:a9fce290a6ba88e5e6e81dd1e800c045212df69ab69d1de0d303b1af9cec692f \
--hash=sha256:f044fec9c7e1b0ec6fdf0d3abc648c2f3b9128933051a9a73af52dbdd9e6d6e9 \
--hash=sha256:23c4a70a9abb8faa35e2967e2e7cbd9225512b706b6eb96b01eb1ccbb2b632c3 \
--hash=sha256:61b95dbfd03ce2a55c38da711cba7130605dbef4839ca12b53c46827826c5c5b \
--hash=sha256:98a21acc7d1e45fcb700831b66ec6c84a3c2a5a94868d72ef83565966adc474f \
--hash=sha256:6f2bf246ee9350f428860c37db6158cfb27a7e585d60b2bb3b88864810875835 \
--hash=sha256:b12241fac561b635329c3275e911a53e104b43875b99d31332d006d52e180912 \
--hash=sha256:7d3c4f10b7a8502a68a8eadcd57e86a35e3948af3edee7bd49a21b225361b0da \
--hash=sha256:02339c53bbf7e438dec371af1f401e4843f9dc5765b3b032032b195dd72b47f2 \
--hash=sha256:31fdcc9eaf2c379e8b416184a0749ce3f95fdaf206b092b63bdc065aecca6a95 \
--hash=sha256:9e67e9fa7dc43210ad766cd6eef133d9d256a530fe07e5585685cdc742170d10 \
--hash=sha256:b906dda76ab70b6905ef3014260e7f1c861a0c4841e29826eb34a6187255504b \
--hash=sha256:07de051fac6dedc6c659034f80bc46623edc776c757fa26f3f467954b12d2403 \
--hash=sha256:36e7438d2f71153cea6b119ddd2648bc010cec4368fd8e7170e50090c0d7ed19 \
--hash=sha256:4855384c27fe7e31efbee32f74659421d64e5bfa8b7df2ec08d306d0f3d4cee6 \
--hash=sha256:3b6a2ef2c6b4e9786939bd9861e7b98bc01cb3024f87c8cf4b78872f2afcf584 \
--hash=sha256:eb92c733be08c6e2b8dfd4613d1b3c2f345ca4f83219d40fda4680333d3a0dc4 \
--hash=sha256:07a8bb9110854c0ab9329adbbec7050af242a78a62e226ab49e9c2182090f501 \
--hash=sha256:11db683f49652b34aa87904b27d00f9032fa2db7f1f9676c05b13361a3c7547c \
--hash=sha256:65cef4766be4be9372621cd17773424302c21785dfaf6e9bd5b64b1f1264f9cc \
--hash=sha256:08ae0a88ac29b92faff069e0511ad27197b3274bdf67ebd8c75aaeb05823c7af \
--hash=sha256:993051db4278f9ec3b191ae823a7bb32b6a91fed6e960d43500fc4ce64cdb4e0 \
--hash=sha256:d79da12a15edd6d7c366766954c4b6de0247e85ba35ee2ad9f37f972e7080f8a \
--hash=sha256:fd1101bd3fcb4f4cf3485bb20d6cb0b56909b94d3bd2a53a6cb9d381c3da3365 \
# via pyramid, pyramid-retry, pyramid-services, repoze.sendmail, transaction, wired, zope.sqlalchemy
zope.sqlalchemy==1.0 \
--hash=sha256:9316a1a8bb9e4f9f59332acf1ad2cc8b664f19a4bde5f68be7f61f3e11f80514 \
Expand Down
6 changes: 0 additions & 6 deletions requirements/tests.txt
Expand Up @@ -61,9 +61,6 @@ freezegun==0.3.15 \
idna==2.9 \
--hash=sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb \
--hash=sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa
importlib-metadata==1.6.0 \
--hash=sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f \
--hash=sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e
lazy==1.4 \
--hash=sha256:2c6d27a5ab130fb85435320651a47403adcb37ecbcc501b0c6606391f65f5b43 \
--hash=sha256:9f293fd531546f3eda039da8f919b513b94f219e562764e3ceefc26fa503bf03
Expand Down Expand Up @@ -150,6 +147,3 @@ webob==1.8.6 \
webtest==2.0.34 \
--hash=sha256:71114cd778a7d7b237ec5c8a5c32084f447d869ae62e48bcd5b73af211133e74 \
--hash=sha256:da9cf14c103ff51a40dee4cac7657840d1317456eb8f0ca81289b5cbff175f4b
zipp==3.1.0 \
--hash=sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b \
--hash=sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96