From 833f67eab2999d6a9fa1487ac1a3e3bde50b664d Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 09:51:23 -0500 Subject: [PATCH 01/15] Bump up PyYaml to recommended version to remediate vulnerability. --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index e56cf624..86b66370 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,4 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls -pyyaml==5.2 +pyyaml>=5.4 From 78fb21b44751db5fbf37c01a5722c0587eaf2c8b Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 12:18:07 -0500 Subject: [PATCH 02/15] Update cryptography to support newer version of PyYAML. --- requirements/core.txt | 2 +- requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/core.txt b/requirements/core.txt index 58d2e8e8..5b35f6f4 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -2,5 +2,5 @@ jsonschema==3.2.0 pyrsistent==0.16.0 requests>=2.21 pyOpenSSL>=19.1.0 -cryptography>=2.8.0 +cryptography>=3.4.8 idna>=2.10 \ No newline at end of file diff --git a/requirements/test.txt b/requirements/test.txt index 86b66370..1a011cd5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,4 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls -pyyaml>=5.4 +PyYAML>=5.4 From 67a81bffc0dde40454b6e4ddd024102730eb99d4 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 12:26:33 -0500 Subject: [PATCH 03/15] Downgrade pyyaml to 5.3.1 to support python3.4 and 3.5.5 --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 1a011cd5..bf4453e1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,4 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls -PyYAML>=5.4 +PyYAML>=5.3.1 From 69ef49f75f181e81523dc2254bf3823d20017d1a Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 12:34:39 -0500 Subject: [PATCH 04/15] PyYAML must be 5.4 or above due to all previous versions being found vulnerable. --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index bf4453e1..86b66370 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,4 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls -PyYAML>=5.3.1 +pyyaml>=5.4 From 00cca4c31bc10cf2694b1d20b151e2d8d6495432 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 12:38:24 -0500 Subject: [PATCH 05/15] test removing pyyaml --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 86b66370..a20c506c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,4 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls -pyyaml>=5.4 + From 8085bd76b23b2562afac319e149eaf2cc1cd7fb6 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 13:03:41 -0500 Subject: [PATCH 06/15] Add back pyyaml as jsonschema appears to require it. --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index a20c506c..86b66370 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,4 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls - +pyyaml>=5.4 From 6e8cf9e459074e8c101cfe78b9889ec9dc8d003e Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 13:23:50 -0500 Subject: [PATCH 07/15] Update cryptography version to 3.4.5 to support jsonschema --- requirements/core.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/core.txt b/requirements/core.txt index 5b35f6f4..b9829e9b 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -2,5 +2,5 @@ jsonschema==3.2.0 pyrsistent==0.16.0 requests>=2.21 pyOpenSSL>=19.1.0 -cryptography>=3.4.8 +cryptography>=3.4.5 idna>=2.10 \ No newline at end of file From 12821c820cebb27d699e6493b42d3911fb2a6c14 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 13:34:50 -0500 Subject: [PATCH 08/15] Update jsonschema --- requirements/core.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/core.txt b/requirements/core.txt index b9829e9b..516138f6 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -1,4 +1,4 @@ -jsonschema==3.2.0 +jsonschema==4.1.0 pyrsistent==0.16.0 requests>=2.21 pyOpenSSL>=19.1.0 From 7b150463786910f3045b38dead4ea21105eb6519 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 13:41:20 -0500 Subject: [PATCH 09/15] Revert --- requirements/core.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/core.txt b/requirements/core.txt index 516138f6..226a6b20 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -1,6 +1,6 @@ -jsonschema==4.1.0 +jsonschema==3.2.0 pyrsistent==0.16.0 requests>=2.21 pyOpenSSL>=19.1.0 -cryptography>=3.4.5 -idna>=2.10 \ No newline at end of file +cryptography>=2.8.0 +idna>=2.10 From 6ea6f4ed9c07c4af570778a24b621c5345284056 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 14:49:49 -0500 Subject: [PATCH 10/15] test --- requirements/test.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 86b66370..13275d51 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,4 +5,3 @@ mock==1.3.0 pytest>=4.6.0 pytest-cov python-coveralls -pyyaml>=5.4 From 916936e2686db066a387222a9314167596f49324 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 15:26:31 -0500 Subject: [PATCH 11/15] Travis test --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7d422399..20d89faa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ python: # - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. # - "pypy" # - "pypy3" +before_install: + - pip uninstall PyYaml install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" after_success: From a7869f36361e9bc037af015405a4967a1fb583f2 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Tue, 9 Nov 2021 15:28:50 -0500 Subject: [PATCH 12/15] Remove travis change. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20d89faa..7d422399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ python: # - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. # - "pypy" # - "pypy3" -before_install: - - pip uninstall PyYaml install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" after_success: From ee64d1adb6c6d923ae0eeea4963fa7751fd968a7 Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Wed, 10 Nov 2021 13:01:27 -0500 Subject: [PATCH 13/15] Test. --- .travis.yml | 2 +- requirements/test.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d422399..413001ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,12 @@ after_success: # Linting and Integration tests need to run first to reset the PR build status to pending. stages: + - 'Test' - 'Source Clear' - 'Lint markdown files' - 'Linting' - 'Integration tests' - 'Full stack production tests' - - 'Test' jobs: include: diff --git a/requirements/test.txt b/requirements/test.txt index 13275d51..48ec696e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -3,5 +3,3 @@ flake8==3.6.0 funcsigs==0.4 mock==1.3.0 pytest>=4.6.0 -pytest-cov -python-coveralls From b5fef06da5b55db5c608eb2f16eda07695627b1e Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Fri, 12 Nov 2021 09:32:31 -0500 Subject: [PATCH 14/15] Remove python 3.4 for test --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 413001ba..562c11b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python python: - "2.7" - - "3.4" +# - "3.4" - "3.5.5" - "3.6" # - "3.7" is handled in 'Test' job using xenial as Python 3.7 is not available for trusty. @@ -15,12 +15,12 @@ after_success: # Linting and Integration tests need to run first to reset the PR build status to pending. stages: - - 'Test' - 'Source Clear' - 'Lint markdown files' - 'Linting' - 'Integration tests' - 'Full stack production tests' + - 'Test' jobs: include: From 34bec0f407411288a7f58b5290599c4b123d414a Mon Sep 17 00:00:00 2001 From: Jake Brown Date: Fri, 12 Nov 2021 09:34:06 -0500 Subject: [PATCH 15/15] Update test.txt --- requirements/test.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements/test.txt b/requirements/test.txt index 48ec696e..7ccdb70e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -3,3 +3,5 @@ flake8==3.6.0 funcsigs==0.4 mock==1.3.0 pytest>=4.6.0 +pytest-cov +python-coveralls \ No newline at end of file