From 70a44f156e3eae7dbdebf47fc2631aea30b1a083 Mon Sep 17 00:00:00 2001
From: Matjaz Pirnovar <matjaz.pirnovar@optimizely.com>
Date: Thu, 25 Feb 2021 14:28:26 -0800
Subject: [PATCH 1/5] 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 24cad8d3..c7553d0a 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 <matjaz.pirnovar@optimizely.com>
Date: Thu, 25 Feb 2021 16:26:28 -0800
Subject: [PATCH 2/5] 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 ce7e0e51..1894c22e 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 <matjaz.pirnovar@optimizely.com>
Date: Thu, 25 Feb 2021 16:34:56 -0800
Subject: [PATCH 3/5] 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 1894c22e..d18a3e10 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 <matjaz.pirnovar@optimizely.com>
Date: Thu, 25 Feb 2021 17:25:38 -0800
Subject: [PATCH 4/5] 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 d18a3e10..3b990d71 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 <matjaz.pirnovar@optimizely.com>
Date: Thu, 25 Feb 2021 17:48:01 -0800
Subject: [PATCH 5/5] 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 3b990d71..9d2da9c0 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"