From 46126c67afa178b78bca2c747a8bdb0190d87bb6 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:07:01 -0700 Subject: [PATCH 1/9] refresh support matrix --- .github/workflows/ci.yml | 42 +++++++++++++++---------------- .github/workflows/coverage.yml | 14 +++++------ .github/workflows/pypiupload.yml | 2 +- .github/workflows/spec_update.yml | 6 ++--- requirements.txt | 1 + setup.py | 9 ++++--- tox.ini | 4 +-- 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ecf98c9..6f65f990 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,18 +10,18 @@ jobs: # https://github.com/actions/python-versions/blob/main/versions-manifest.json strategy: matrix: - os: [macos-latest, windows-latest] - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy-2.7, pypy-3.7] - exclude: - - os: windows-latest - python-version: 3.6 + os: [macos-13, windows-2022] + python-version: [3.8, 3.9, 3.10, 3.11, 3.12] include: - - os: ubuntu-latest - python-version: 3.7 + - os: ubuntu-22.04 + python-version: [2.7, 3.8, 3.9, 3.10, 3.11, 3.12, pypy-2.7, pypy-3.9, pypy-3.10] + include: + - os: macos-14 + python-version: [3.10, 3.11, 3.12] steps: - uses: actions/checkout@v2 - name: Setup Python environment - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: python-version: ${{ matrix.python-version }} - name: Install Requirements @@ -38,13 +38,13 @@ jobs: run: | pytest test/unit/test_dropbox_unit.py Docs: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v2 - name: Setup Python environment - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: - python-version: '3.7' + python-version: '3.8' - name: Install Requirements run: | python -m pip install --upgrade pip @@ -64,18 +64,18 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, windows-latest] - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy-2.7, pypy-3.7] - exclude: - - os: windows-latest - python-version: 3.6 - include: - - os: ubuntu-latest - python-version: 3.7 + os: [macos-13, windows-2022] + python-version: [3.8, 3.9, 3.10, 3.11, 3.12] + include: + - os: ubuntu-22.04 + python-version: [2.7, 3.8, 3.9, 3.10, 3.11, 3.12, pypy-2.7, pypy-3.9, pypy-3.10] + include: + - os: macos-14 + python-version: [3.10, 3.11, 3.12] steps: - uses: actions/checkout@v2.3.4 - name: Setup Python environment - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: python-version: ${{ matrix.python-version }} - name: Install Requirements @@ -101,4 +101,4 @@ jobs: SCOPED_TEAM_REFRESH_TOKEN: ${{ secrets.SCOPED_TEAM_REFRESH_TOKEN }} DROPBOX_SHARED_LINK: ${{ secrets.DROPBOX_SHARED_LINK }} run: | - pytest test/integration/test_dropbox.py \ No newline at end of file + pytest test/integration/test_dropbox.py diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 87cf19d1..356ef859 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -9,13 +9,13 @@ on: jobs: Coverage: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Setup Python environment - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: - python-version: '3.7' + python-version: '3.8' - name: Install Requirements run: | python -m pip install --upgrade pip @@ -33,13 +33,13 @@ jobs: flags: unit fail_ci_if_error: true IntegrationCoverage: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Setup Python environment - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: - python-version: '3.7' + python-version: '3.8' - name: Install Requirements run: | python -m pip install --upgrade pip @@ -69,4 +69,4 @@ jobs: uses: codecov/codecov-action@v1.3.2 with: flags: integration - fail_ci_if_error: true \ No newline at end of file + fail_ci_if_error: true diff --git a/.github/workflows/pypiupload.yml b/.github/workflows/pypiupload.yml index 3c7f1675..e0165cb9 100644 --- a/.github/workflows/pypiupload.yml +++ b/.github/workflows/pypiupload.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup Python - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/spec_update.yml b/.github/workflows/spec_update.yml index f4a60c7c..00cbb61c 100644 --- a/.github/workflows/spec_update.yml +++ b/.github/workflows/spec_update.yml @@ -6,13 +6,13 @@ on: jobs: Update: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Setup Python environment - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v2.3.4 with: - python-version: 3.7 + python-version: 3.8 - name: Get current time uses: 1466587594/get-current-time@v2 id: current-time diff --git a/requirements.txt b/requirements.txt index 2c55c04b..a7a4074d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,5 @@ pytest pytest-runner sphinx twine +setuptools; python_version>="3.12" wheel diff --git a/setup.py b/setup.py index efbd57de..4d373558 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ 'requests >= 2.16.2', 'six >= 1.12.0', 'stone >= 2', + 'setuptools', ] setup_requires = [ @@ -72,11 +73,11 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Software Development :: Libraries :: Python Modules', diff --git a/tox.ini b/tox.ini index 203030f2..4f1dedcb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = py{27,34,35,36,37,38,39-dev,py,py3},check,lint,docs,test_unit,coverage +envlist = py{27,38,39,310,311,312,py,py3},check,lint,docs,test_unit,coverage skip_missing_interpreters = true [flake8] @@ -86,4 +86,4 @@ description = invoke sphinx-build to build the HTML docs extras = docs commands = sphinx-build -b html docs build/html deps = - sphinx \ No newline at end of file + sphinx From e59199b08a5119e028d8ce968e4bee5c84d87dd7 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:09:57 -0700 Subject: [PATCH 2/9] * --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 4f1dedcb..0a101c7f 100644 --- a/tox.ini +++ b/tox.ini @@ -41,6 +41,7 @@ commands = deps = twine + wheel usedevelop = true From 29d68853380ff55cc07bad2ea43c3c3d032fb440 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:14:50 -0700 Subject: [PATCH 3/9] lint --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f65f990..f3a04bf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,6 @@ jobs: include: - os: ubuntu-22.04 python-version: [2.7, 3.8, 3.9, 3.10, 3.11, 3.12, pypy-2.7, pypy-3.9, pypy-3.10] - include: - os: macos-14 python-version: [3.10, 3.11, 3.12] steps: @@ -69,10 +68,9 @@ jobs: include: - os: ubuntu-22.04 python-version: [2.7, 3.8, 3.9, 3.10, 3.11, 3.12, pypy-2.7, pypy-3.9, pypy-3.10] - include: - os: macos-14 python-version: [3.10, 3.11, 3.12] - steps: + steps: - uses: actions/checkout@v2.3.4 - name: Setup Python environment uses: actions/setup-python@v2.3.4 From f3f9ac7725d1156b53f0c333d7558d4d299acde0 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:19:01 -0700 Subject: [PATCH 4/9] another attempt --- .github/workflows/ci.yml | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3a04bf8..f7822111 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,13 +10,23 @@ jobs: # https://github.com/actions/python-versions/blob/main/versions-manifest.json strategy: matrix: - os: [macos-13, windows-2022] - python-version: [3.8, 3.9, 3.10, 3.11, 3.12] + os: [macos-13, windows-2022, ubuntu-22.04] + python-version: [3.8, 3.9, "3.10", 3.11, 3.12] include: - os: ubuntu-22.04 - python-version: [2.7, 3.8, 3.9, 3.10, 3.11, 3.12, pypy-2.7, pypy-3.9, pypy-3.10] + python-version: 2.7 + - os: ubuntu-22.04 + python-version: pypy-2.7 + - os: ubuntu-22.04 + python-version: pypy-3.9 + - os: ubuntu-22.04 + python-version: pypy-3.10 + - os: macos-14 + python-version: 3.10 + - os: macos-14 + python-version: 3.11 - os: macos-14 - python-version: [3.10, 3.11, 3.12] + python-version: 3.12 steps: - uses: actions/checkout@v2 - name: Setup Python environment @@ -63,13 +73,23 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-13, windows-2022] - python-version: [3.8, 3.9, 3.10, 3.11, 3.12] + os: [macos-13, windows-2022, ubuntu-22.04] + python-version: [3.8, 3.9, "3.10", 3.11, 3.12] include: - os: ubuntu-22.04 - python-version: [2.7, 3.8, 3.9, 3.10, 3.11, 3.12, pypy-2.7, pypy-3.9, pypy-3.10] + python-version: 2.7 + - os: ubuntu-22.04 + python-version: pypy-2.7 + - os: ubuntu-22.04 + python-version: pypy-3.9 + - os: ubuntu-22.04 + python-version: pypy-3.10 + - os: macos-14 + python-version: 3.10 + - os: macos-14 + python-version: 3.11 - os: macos-14 - python-version: [3.10, 3.11, 3.12] + python-version: 3.12 steps: - uses: actions/checkout@v2.3.4 - name: Setup Python environment From 7f6637c2b7e2f099e5eadf3484da8771869f2f7c Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:21:26 -0700 Subject: [PATCH 5/9] fewer mac tests, fix parsing --- .github/workflows/ci.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7822111..813cdc36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,12 +21,8 @@ jobs: python-version: pypy-3.9 - os: ubuntu-22.04 python-version: pypy-3.10 - - os: macos-14 - python-version: 3.10 - - os: macos-14 - python-version: 3.11 - - os: macos-14 - python-version: 3.12 + - os: macos-14 # apple silicon + python-version: "3.10" steps: - uses: actions/checkout@v2 - name: Setup Python environment @@ -84,12 +80,8 @@ jobs: python-version: pypy-3.9 - os: ubuntu-22.04 python-version: pypy-3.10 - - os: macos-14 - python-version: 3.10 - - os: macos-14 - python-version: 3.11 - - os: macos-14 - python-version: 3.12 + - os: macos-14 # apple silicon + python-version: "3.10" steps: - uses: actions/checkout@v2.3.4 - name: Setup Python environment From 711cacc910f8f073216decfaa75fc1277851e93e Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:23:01 -0700 Subject: [PATCH 6/9] gh action runners no longer support python2 (`python-versions`) --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 813cdc36..8e009b4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,6 @@ jobs: os: [macos-13, windows-2022, ubuntu-22.04] python-version: [3.8, 3.9, "3.10", 3.11, 3.12] include: - - os: ubuntu-22.04 - python-version: 2.7 - - os: ubuntu-22.04 - python-version: pypy-2.7 - os: ubuntu-22.04 python-version: pypy-3.9 - os: ubuntu-22.04 @@ -72,10 +68,6 @@ jobs: os: [macos-13, windows-2022, ubuntu-22.04] python-version: [3.8, 3.9, "3.10", 3.11, 3.12] include: - - os: ubuntu-22.04 - python-version: 2.7 - - os: ubuntu-22.04 - python-version: pypy-2.7 - os: ubuntu-22.04 python-version: pypy-3.9 - os: ubuntu-22.04 From ab0fca613b00f2c6fa89842c50b811c24710aedf Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:36:25 -0700 Subject: [PATCH 7/9] no longer necessary since we won't run ci on py2.7 --- requirements.txt | 2 +- setup.py | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index a7a4074d..c963d483 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ stone >= 2 # Other dependencies for development ply pytest -pytest-runner +pytest-runner == 5.3.2 sphinx twine setuptools; python_version>="3.12" diff --git a/setup.py b/setup.py index 4d373558..9b0b4d59 100644 --- a/setup.py +++ b/setup.py @@ -31,12 +31,6 @@ 'setuptools', ] -setup_requires = [ - # Pin pytest-runner to 5.2.0, since 5.3.0 uses `find_namespaces` directive, not supported in - # Python 2.7 - 'pytest-runner == 5.2.0', -] - # WARNING: This imposes limitations on test/requirements.txt such that the # full Pip syntax is not supported. See also # . @@ -51,7 +45,6 @@ name='dropbox', version=version, install_requires=install_reqs, - setup_requires=setup_requires, tests_require=test_reqs, packages=['dropbox'], package_data={'dropbox': ['trusted-certs.crt']}, @@ -72,7 +65,7 @@ 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 2.7', # untested 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', From a7e8830269a32884b61c3452ed8c3b30b52aa57e Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:38:56 -0700 Subject: [PATCH 8/9] last of 2.7 --- .github/workflows/pypiupload.yml | 2 +- setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pypiupload.yml b/.github/workflows/pypiupload.yml index e0165cb9..d1d228c9 100644 --- a/.github/workflows/pypiupload.yml +++ b/.github/workflows/pypiupload.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [2.7, 3.x] + python-version: [3.x] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 9b0b4d59..25c12507 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,6 @@ 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', # untested 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', From a5912f62be909fd032f62a4aa8a5b03d9bdc24d0 Mon Sep 17 00:00:00 2001 From: Max Belanger Date: Mon, 6 May 2024 16:58:35 -0700 Subject: [PATCH 9/9] missed a spot --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0a101c7f..f8f7a36d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = py{27,38,39,310,311,312,py,py3},check,lint,docs,test_unit,coverage +envlist = py{38,39,310,311,312,py,py3},check,lint,docs,test_unit,coverage skip_missing_interpreters = true [flake8]