From 1cfd9d263cd0b13fc40d527220a819ce77cec542 Mon Sep 17 00:00:00 2001 From: Wu Yun Date: Wed, 3 Jul 2024 17:48:37 +0800 Subject: [PATCH 1/5] chore: Pin request/urllib version on Python 3.9 --- .github/workflows/pythonpackage.yml | 7 +++---- changelog | 6 ++++++ requirements.txt | 4 ++-- setup.py | 5 +++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index b599464..f8fe412 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - name: Set up Python + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.6' @@ -43,10 +43,10 @@ jobs: strategy: max-parallel: 1 matrix: - python-version: [3.6, 3.9] + python-version: [3.6, 3.8, 3.9] steps: - uses: actions/checkout@v2 - - name: Set up Python + - name: Set up Python uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} @@ -63,4 +63,3 @@ jobs: USE_REGION: US run: nosetests -v - diff --git a/changelog b/changelog index 7539ac0..744d76e 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +## [3.0.2] - 2024-07-03 + +## Chore + +- Pin requests/urllib version on Python 3.9 + ## [3.0.1] - 2024-06-25 ## Fixed diff --git a/requirements.txt b/requirements.txt index 023768a..88b7ab5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,8 @@ arrow>=1.0.0,<2.0.0; python_version >= '3.6' iso8601>=0.1.14 six>=1.11.0 qiniu>=7.3.1 -requests<=2.31.0 -urllib3<=1.26.18 +requests<=2.31.0; python_version == '3.9' +urllib3<=1.26.18; python_version == '3.9' requests-toolbelt==1.0.0 Werkzeug>=0.16.0,<2.0.0 secure-cookie>=0.1.0,<1.0.0 diff --git a/setup.py b/setup.py index 129a9e4..e0604a7 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,8 @@ 'iso8601>=0.1.14', 'six>=1.11.0', 'qiniu==7.3.1', - 'requests>=2.25.1', + "requests<=2.31.0; python_version == '3.9'" + "urllib3<=1.26.18; python_version == '3.9'" 'requests-toolbelt>=1.0.0', 'Werkzeug>=0.16.0,<2.0.0', 'secure-cookie>=0.1.0,<1.0.0', @@ -22,7 +23,7 @@ setup( name='leancloud', - version='3.0.1', + version='3.0.2', description='LeanCloud Python SDK', url='https://leancloud.cn/', author='asaka', From 99369d68917519e6468da0b585384befa3f067c7 Mon Sep 17 00:00:00 2001 From: Wu Yun Date: Wed, 3 Jul 2024 17:54:34 +0800 Subject: [PATCH 2/5] fix: comma --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index e0604a7..84d5212 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,8 @@ 'iso8601>=0.1.14', 'six>=1.11.0', 'qiniu==7.3.1', - "requests<=2.31.0; python_version == '3.9'" - "urllib3<=1.26.18; python_version == '3.9'" + "requests<=2.31.0; python_version == '3.9'", + "urllib3<=1.26.18; python_version == '3.9'", 'requests-toolbelt>=1.0.0', 'Werkzeug>=0.16.0,<2.0.0', 'secure-cookie>=0.1.0,<1.0.0', From 718fa406eda8db27253792b8791e6c93e89d0a00 Mon Sep 17 00:00:00 2001 From: Wu Yun Date: Thu, 4 Jul 2024 10:42:45 +0800 Subject: [PATCH 3/5] fix: pin for python 3.8 too --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 88b7ab5..9a82775 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,8 @@ arrow>=1.0.0,<2.0.0; python_version >= '3.6' iso8601>=0.1.14 six>=1.11.0 qiniu>=7.3.1 -requests<=2.31.0; python_version == '3.9' -urllib3<=1.26.18; python_version == '3.9' +requests<=2.31.0; python_version >= '3.8' +urllib3<=1.26.18; python_version >= '3.8' requests-toolbelt==1.0.0 Werkzeug>=0.16.0,<2.0.0 secure-cookie>=0.1.0,<1.0.0 diff --git a/setup.py b/setup.py index 84d5212..d0b81f3 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,8 @@ 'iso8601>=0.1.14', 'six>=1.11.0', 'qiniu==7.3.1', - "requests<=2.31.0; python_version == '3.9'", - "urllib3<=1.26.18; python_version == '3.9'", + "requests<=2.31.0; python_version >= '3.8'", + "urllib3<=1.26.18; python_version >= '3.8'", 'requests-toolbelt>=1.0.0', 'Werkzeug>=0.16.0,<2.0.0', 'secure-cookie>=0.1.0,<1.0.0', From 373f75bca2c2fd2668b389fe16b95c2ba09206e1 Mon Sep 17 00:00:00 2001 From: Wu Yun Date: Thu, 4 Jul 2024 10:56:44 +0800 Subject: [PATCH 4/5] test: for python 3.7 --- .github/workflows/pythonpackage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index f8fe412..8ffa95b 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.6' + python-version: '3.9' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -43,7 +43,7 @@ jobs: strategy: max-parallel: 1 matrix: - python-version: [3.6, 3.8, 3.9] + python-version: [3.6, 3.7, 3.9] steps: - uses: actions/checkout@v2 - name: Set up Python From 9d0c5d4397d04aa440b608726845831728af0347 Mon Sep 17 00:00:00 2001 From: Wu Yun Date: Thu, 4 Jul 2024 11:13:04 +0800 Subject: [PATCH 5/5] test: pin versions for python 3.7 --- changelog | 2 +- requirements.txt | 4 ++-- setup.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 744d76e..c4b3561 100644 --- a/changelog +++ b/changelog @@ -2,7 +2,7 @@ ## Chore -- Pin requests/urllib version on Python 3.9 +- Pin requests/urllib version on Python 3.7+ ## [3.0.1] - 2024-06-25 diff --git a/requirements.txt b/requirements.txt index 9a82775..4f12565 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,8 @@ arrow>=1.0.0,<2.0.0; python_version >= '3.6' iso8601>=0.1.14 six>=1.11.0 qiniu>=7.3.1 -requests<=2.31.0; python_version >= '3.8' -urllib3<=1.26.18; python_version >= '3.8' +requests<=2.31.0; python_version >= '3.7' +urllib3<=1.26.18; python_version >= '3.7' requests-toolbelt==1.0.0 Werkzeug>=0.16.0,<2.0.0 secure-cookie>=0.1.0,<1.0.0 diff --git a/setup.py b/setup.py index d0b81f3..33a7a6c 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,8 @@ 'iso8601>=0.1.14', 'six>=1.11.0', 'qiniu==7.3.1', - "requests<=2.31.0; python_version >= '3.8'", - "urllib3<=1.26.18; python_version >= '3.8'", + "requests<=2.31.0; python_version >= '3.7'", + "urllib3<=1.26.18; python_version >= '3.7'", 'requests-toolbelt>=1.0.0', 'Werkzeug>=0.16.0,<2.0.0', 'secure-cookie>=0.1.0,<1.0.0',