From 7d4bb68683589445b9b77b5a3a80b612df0c9a6e Mon Sep 17 00:00:00 2001 From: John Walker Date: Tue, 30 Oct 2018 10:51:37 -0700 Subject: [PATCH 1/4] Update frozen upstream requirements Generated using: tox -e freeze-upstream-requirements-py27 tox -e freeze-upstream-requirements-py37 tox -e test-upstream-requirements-py27 tox -e test-upstream-requirements-py37 --- test/upstream-requirements-py27.txt | 36 ++++++++++++++--------------- test/upstream-requirements-py37.txt | 36 ++++++++++++++--------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/test/upstream-requirements-py27.txt b/test/upstream-requirements-py27.txt index 9a12a7b1..91e7418f 100644 --- a/test/upstream-requirements-py27.txt +++ b/test/upstream-requirements-py27.txt @@ -9,20 +9,20 @@ backports.weakref==1.0.post1 boto==2.49.0 boto3==1.7.84 botocore==1.10.84 -certifi==2018.8.24 +certifi==2018.10.15 cffi==1.11.5 chardet==3.0.4 cookies==2.2.1 coverage==4.5.1 cryptography==2.3.1 -docker==3.5.0 +docker==3.5.1 docker-pycreds==0.3.0 docutils==0.14 ecdsa==0.13 enum34==1.1.6 execnet==1.5.0 funcsigs==1.0.2 -future==0.16.0 +future==0.17.0 futures==3.2.0 hypothesis==3.63.0 idna==2.7 @@ -30,34 +30,34 @@ ipaddress==1.0.22 Jinja2==2.10 jmespath==0.9.3 jsondiff==1.1.1 -jsonpickle==0.9.6 +jsonpickle==1.0 MarkupSafe==1.0 mock==2.0.0 more-itertools==4.3.0 -moto==1.3.5 +moto==1.3.6 pathlib2==2.3.2 -pbr==4.2.0 -pluggy==0.7.1 -py==1.6.0 +pbr==5.1.0 +pluggy==0.8.0 +py==1.7.0 pyaml==17.12.1 -pycparser==2.18 -pycryptodome==3.6.6 -pytest==3.8.0 +pycparser==2.19 +pycryptodome==3.7.0 +pytest==3.9.3 pytest-cov==2.6.0 pytest-forked==0.2 pytest-mock==1.10.0 -pytest-xdist==1.23.0 -python-dateutil==2.7.3 +pytest-xdist==1.24.0 +python-dateutil==2.7.5 python-jose==2.0.2 -pytz==2018.5 +pytz==2018.7 PyYAML==3.13 -requests==2.19.1 -responses==0.9.0 +requests==2.20.0 +responses==0.10.2 s3transfer==0.1.13 scandir==1.9.0 six==1.11.0 -urllib3==1.23 -websocket-client==0.52.0 +urllib3==1.24 +websocket-client==0.53.0 Werkzeug==0.14.1 wrapt==1.10.11 xmltodict==0.11.0 diff --git a/test/upstream-requirements-py37.txt b/test/upstream-requirements-py37.txt index 28d1fa60..c6bd5590 100644 --- a/test/upstream-requirements-py37.txt +++ b/test/upstream-requirements-py37.txt @@ -6,49 +6,49 @@ aws-xray-sdk==0.95 boto==2.49.0 boto3==1.7.84 botocore==1.10.84 -certifi==2018.8.24 +certifi==2018.10.15 cffi==1.11.5 chardet==3.0.4 cookies==2.2.1 coverage==4.5.1 cryptography==2.3.1 -docker==3.5.0 +docker==3.5.1 docker-pycreds==0.3.0 docutils==0.14 ecdsa==0.13 execnet==1.5.0 -future==0.16.0 +future==0.17.0 hypothesis==3.63.0 idna==2.7 Jinja2==2.10 jmespath==0.9.3 jsondiff==1.1.1 -jsonpickle==0.9.6 +jsonpickle==1.0 MarkupSafe==1.0 mock==2.0.0 more-itertools==4.3.0 -moto==1.3.5 -pbr==4.2.0 -pluggy==0.7.1 -py==1.6.0 +moto==1.3.6 +pbr==5.1.0 +pluggy==0.8.0 +py==1.7.0 pyaml==17.12.1 -pycparser==2.18 -pycryptodome==3.6.6 -pytest==3.8.0 +pycparser==2.19 +pycryptodome==3.7.0 +pytest==3.9.3 pytest-cov==2.6.0 pytest-forked==0.2 pytest-mock==1.10.0 -pytest-xdist==1.23.0 -python-dateutil==2.7.3 +pytest-xdist==1.24.0 +python-dateutil==2.7.5 python-jose==2.0.2 -pytz==2018.5 +pytz==2018.7 PyYAML==3.13 -requests==2.19.1 -responses==0.9.0 +requests==2.20.0 +responses==0.10.2 s3transfer==0.1.13 six==1.11.0 -urllib3==1.23 -websocket-client==0.52.0 +urllib3==1.24 +websocket-client==0.53.0 Werkzeug==0.14.1 wrapt==1.10.11 xmltodict==0.11.0 From 56e17b18f8239681f5ce93a82bdcfb3c6dedca93 Mon Sep 17 00:00:00 2001 From: John Walker Date: Tue, 30 Oct 2018 11:34:09 -0700 Subject: [PATCH 2/4] Document how to freeze and test upstream requirements Document how to freeze and test upstream requirements. --- test/README.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/README.rst b/test/README.rst index da6bf6ef..3ecc47dc 100644 --- a/test/README.rst +++ b/test/README.rst @@ -14,3 +14,19 @@ In order to run these integration tests successfully, these things which must be .. _automatically discoverable credential locations: http://boto3.readthedocs.io/en/latest/guide/configuration.html .. _AWS KMS CMK ARN: http://docs.aws.amazon.com/kms/latest/APIReference/API_Encrypt.html + +Updating Upstream Requirements +============================== + +In order to update the upstream requirements in `upstream-requirements-py37.txt` and +`upstream-requirements-py27.txt`, run these commands: + + .. code:: + + $ tox -e freeze-upstream-requirements-py27 + $ tox -e freeze-upstream-requirements-py37 + +Test them using: + .. code:: + $ tox -e test-upstream-requirements-py27 + $ tox -e test-upstream-requirements-py37 From 3b52621e61e82c51c3243bdc26142abd7fb0fced Mon Sep 17 00:00:00 2001 From: John Walker Date: Tue, 30 Oct 2018 14:29:57 -0700 Subject: [PATCH 3/4] Document purpose of the upstream requirements These were already documented through commits and code. It adds a few sentences of explanation for why the upstream requirements exists to the README, so that people know what they are updating. --- test/README.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/README.rst b/test/README.rst index 3ecc47dc..e73757f4 100644 --- a/test/README.rst +++ b/test/README.rst @@ -18,7 +18,11 @@ In order to run these integration tests successfully, these things which must be Updating Upstream Requirements ============================== -In order to update the upstream requirements in `upstream-requirements-py37.txt` and +The purpose of the upstream requirements files is to provide a stable list of +packages for pyca/cryptography's downstream test of the DynamoDB Encryption +Client. They are frozen so that dependencies unrelated to pyca/cryptography +don't break the pyca/cryptography CI. In order to update the upstream +requirements in `upstream-requirements-py37.txt` and `upstream-requirements-py27.txt`, run these commands: .. code:: @@ -27,6 +31,7 @@ In order to update the upstream requirements in `upstream-requirements-py37.txt` $ tox -e freeze-upstream-requirements-py37 Test them using: + .. code:: $ tox -e test-upstream-requirements-py27 $ tox -e test-upstream-requirements-py37 From 318c170528d9ba0041fe48e7565423c6211185f8 Mon Sep 17 00:00:00 2001 From: John Walker Date: Wed, 31 Oct 2018 10:38:51 -0700 Subject: [PATCH 4/4] Generalize documentation about upstream requirements These requirements files aren't just for pyca/cryptography, they're also for anyone that wants to run downstream tests. --- test/README.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/README.rst b/test/README.rst index e73757f4..42cace9f 100644 --- a/test/README.rst +++ b/test/README.rst @@ -19,11 +19,9 @@ Updating Upstream Requirements ============================== The purpose of the upstream requirements files is to provide a stable list of -packages for pyca/cryptography's downstream test of the DynamoDB Encryption -Client. They are frozen so that dependencies unrelated to pyca/cryptography -don't break the pyca/cryptography CI. In order to update the upstream -requirements in `upstream-requirements-py37.txt` and -`upstream-requirements-py27.txt`, run these commands: +packages for dependencies to run downstream tests of the DynamoDB Encryption +Client. In order to update the upstream requirements in `upstream-requirements-py37.txt` +and `upstream-requirements-py27.txt`, run these commands: .. code::