From 70a44f156e3eae7dbdebf47fc2631aea30b1a083 Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 14:28:26 -0800 Subject: [PATCH 1/9] fix: bump mmh3 version to 3.0.0 --- requirements/core.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/core.txt b/requirements/core.txt index 24cad8d3e..c7553d0ae 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -1,4 +1,4 @@ jsonschema==3.2.0 pyrsistent==0.14.0 -mmh3==2.5.1 +mmh3==3.0.0 requests[security]>=2.9.1 From ed5c2c0e590b282c98d63ee017d6f4d411ccb22e Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 16:26:28 -0800 Subject: [PATCH 2/9] upgrade pypy version to 7.3.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce7e0e51d..1894c22eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - "3.6" # - "3.7" is handled in 'Test' job using xenial as Python 3.7 is not available for trusty. # - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. - - "pypy" + - "pypy2.7-v7.3.3" - "pypy3" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" From 932f5b3f3ff4a093ebf9e38b49d6a1bf70804df2 Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 16:34:56 -0800 Subject: [PATCH 3/9] upgrade ubuntu linux distro to bionic (18.04) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1894c22eb..d18a3e109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - "3.6" # - "3.7" is handled in 'Test' job using xenial as Python 3.7 is not available for trusty. # - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. - - "pypy2.7-v7.3.3" + - "pypy" - "pypy3" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" @@ -63,10 +63,10 @@ jobs: FULLSTACK_TEST_REPO=ProdTesting - stage: 'Test' - dist: xenial + dist: bionic python: "3.7" - stage: 'Test' - dist: xenial + dist: bionic python: "3.8" - stage: 'Source Clear' From 3aec18cc3045c10b08245b7eb8a926adf37a1554 Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 17:25:38 -0800 Subject: [PATCH 4/9] fix: back to xenial. enable 3.7, 3.8 tests with other versions --- .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d18a3e109..3b990d714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ python: - "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. -# - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. + - "3.7" + - "3.8" - "pypy" - "pypy3" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" @@ -62,13 +62,6 @@ jobs: SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH FULLSTACK_TEST_REPO=ProdTesting - - stage: 'Test' - dist: bionic - python: "3.7" - - stage: 'Test' - dist: bionic - python: "3.8" - - stage: 'Source Clear' if: type = cron addons: From c09de19e0606ba2a39c4f93ad438c9db03e55fb2 Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 17:48:01 -0800 Subject: [PATCH 5/9] fix: specify pypy2.7-7.3.1 version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b990d714..9d2da9c09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ python: - "3.6" - "3.7" - "3.8" - - "pypy" + - "pypy2.7-7.3.1" - "pypy3" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" From e6978f2b90aaec4f638ccaa560e26d81de74723e Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 17:59:00 -0800 Subject: [PATCH 6/9] fix: revert back to pypy and separating 3.7, 3.8 versions --- .travis.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d2da9c09..ce7e0e51d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ python: - "3.4" - "3.5.5" - "3.6" - - "3.7" - - "3.8" - - "pypy2.7-7.3.1" +# - "3.7" is handled in 'Test' job using xenial as Python 3.7 is not available for trusty. +# - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. + - "pypy" - "pypy3" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" @@ -62,6 +62,13 @@ jobs: SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH FULLSTACK_TEST_REPO=ProdTesting + - stage: 'Test' + dist: xenial + python: "3.7" + - stage: 'Test' + dist: xenial + python: "3.8" + - stage: 'Source Clear' if: type = cron addons: From 041ead3402070c0bfa343a1f6e06ce454bc28c4c Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Thu, 25 Feb 2021 18:09:41 -0800 Subject: [PATCH 7/9] fix: back to bring back Py 3.7, 3.8 to the rest of teh versions --- .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce7e0e51d..3b990d714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ python: - "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. -# - "3.8" is handled in 'Test' job using xenial as Python 3.8 is not available for trusty. + - "3.7" + - "3.8" - "pypy" - "pypy3" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" @@ -62,13 +62,6 @@ jobs: SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH FULLSTACK_TEST_REPO=ProdTesting - - stage: 'Test' - dist: xenial - python: "3.7" - - stage: 'Test' - dist: xenial - python: "3.8" - - stage: 'Source Clear' if: type = cron addons: From dd888e9f044e40ae48f2edb896290d0b7af291d1 Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Sat, 27 Feb 2021 14:17:00 -0800 Subject: [PATCH 8/9] fix: try lates versions of pypy, pypy3 that travis supports --- .travis.yml | 4 ++-- requirements/core.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b990d714..be8c73104 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ python: - "3.6" - "3.7" - "3.8" - - "pypy" - - "pypy3" + - "pypy2.7-7.3.1" + - "pypy3.6-7.3.1" install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" script: "pytest --cov=optimizely" after_success: diff --git a/requirements/core.txt b/requirements/core.txt index c7553d0ae..24cad8d3e 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -1,4 +1,4 @@ jsonschema==3.2.0 pyrsistent==0.14.0 -mmh3==3.0.0 +mmh3==2.5.1 requests[security]>=2.9.1 From 8b11e2351740f16730a72ff6b2f78ec7ee70dd6f Mon Sep 17 00:00:00 2001 From: Matjaz Pirnovar Date: Mon, 1 Mar 2021 22:55:56 -0800 Subject: [PATCH 9/9] fix: add logs to pip install for debugging --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be8c73104..64aa55699 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,8 @@ python: - "3.8" - "pypy2.7-7.3.1" - "pypy3.6-7.3.1" -install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" +#install: "pip install -r requirements/core.txt;pip install -r requirements/test.txt" +install: "pip install --no-cache-dir --verbose -r requirements/core.txt --log LOG_PIP_CORE; pip install --no-cache-dir -r requirements/test.txt --log LOG_PIP_TEST" script: "pytest --cov=optimizely" after_success: - coveralls