From 36be89f16214bc1fa557182220fc1405b17229f7 Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 5 May 2021 15:26:25 +0200 Subject: [PATCH 1/5] Refactor tests dependencies --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 90b0185d..b7e4e33a 100644 --- a/setup.py +++ b/setup.py @@ -23,10 +23,10 @@ 'unittest2' ] -version = sys.version_info -if version[0] == 2 or (version[0] == 3 and version[1] < 4): - tests_require.append('mock<=3.0.5') # mock > 3.0.5 requires python >= 3.5 +if sys.version_info < (3, 4): tests_require.append('enum34') +if sys.version_info < (3, 6): + tests_require.append('mock<=3.0.5') # mock > 3.0.5 requires python >= 3.6 setup( name='rollbar', From c0de6dc60c7aaa66e3d0c6eda82bee2dffedf36f Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 5 May 2021 15:36:29 +0200 Subject: [PATCH 2/5] Install mock package if not bundled in standard library unittest.mock has been added in Python3.3 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b7e4e33a..a1ecb7e0 100644 --- a/setup.py +++ b/setup.py @@ -23,10 +23,10 @@ 'unittest2' ] +if sys.version_info < (3, 3): + tests_require.append('mock<=3.0.5') # mock > 3.0.5 requires python >= 3.6 if sys.version_info < (3, 4): tests_require.append('enum34') -if sys.version_info < (3, 6): - tests_require.append('mock<=3.0.5') # mock > 3.0.5 requires python >= 3.6 setup( name='rollbar', From 2350f65f659bca72a2e7532b75d7eaf02b107141 Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 5 May 2021 18:15:17 +0200 Subject: [PATCH 3/5] Force installing six and requests for Py3.3 via pip `python setup.py test` fails to retrieve packages from PYPI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b19a1541..13aa2416 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,7 +143,7 @@ jobs: - name: Python 3.3 dependencies if: ${{ matrix.python-version == '3.3' }} - run: pip install Werkzeug==0.14.1 --force-reinstall + run: pip install Werkzeug==0.14.1 six>=1.9.0 requests>=0.12.1 --force-reinstall - name: Set the framework run: echo ${{ matrix.framework }} >> $GITHUB_ENV From 91ff8492bf0d47488fbd14f3f82651afeaafa6b9 Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 5 May 2021 18:19:49 +0200 Subject: [PATCH 4/5] Force to install enum34 package for Py3.3 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13aa2416..45301007 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,7 +143,7 @@ jobs: - name: Python 3.3 dependencies if: ${{ matrix.python-version == '3.3' }} - run: pip install Werkzeug==0.14.1 six>=1.9.0 requests>=0.12.1 --force-reinstall + run: pip install Werkzeug==0.14.1 six>=1.9.0 requests>=0.12.1 enum34 --force-reinstall - name: Set the framework run: echo ${{ matrix.framework }} >> $GITHUB_ENV From e4f3109b6e74111975b58d7b64cfcb9c5bd5d84f Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 5 May 2021 18:22:36 +0200 Subject: [PATCH 5/5] Force to install all packages via pip for Python3.3 --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45301007..8390173f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,7 +143,8 @@ jobs: - name: Python 3.3 dependencies if: ${{ matrix.python-version == '3.3' }} - run: pip install Werkzeug==0.14.1 six>=1.9.0 requests>=0.12.1 enum34 --force-reinstall + run: pip install --force-reinstall \ + Werkzeug==0.14.1 six>=1.9.0 requests>=0.12.1 enum34 unittest2 blinker webob - name: Set the framework run: echo ${{ matrix.framework }} >> $GITHUB_ENV