Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh support matrix for Python 3.12 #490

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 24 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@ 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, ubuntu-22.04]
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: pypy-3.9
- os: ubuntu-22.04
python-version: pypy-3.10
- os: macos-14 # apple silicon
python-version: "3.10"
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
Expand All @@ -38,13 +39,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
Expand All @@ -64,18 +65,19 @@ 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
steps:
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: pypy-3.9
- os: ubuntu-22.04
python-version: pypy-3.10
- os: macos-14 # apple silicon
python-version: "3.10"
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
Expand All @@ -101,4 +103,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
pytest test/integration/test_dropbox.py
14 changes: 7 additions & 7 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -69,4 +69,4 @@ jobs:
uses: codecov/codecov-action@v1.3.2
with:
flags: integration
fail_ci_if_error: true
fail_ci_if_error: true
4 changes: 2 additions & 2 deletions .github/workflows/pypiupload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [2.7, 3.x]
python-version: [3.x]

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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/spec_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ stone >= 2
# Other dependencies for development
ply
pytest
pytest-runner
pytest-runner == 5.3.2
sphinx
twine
setuptools; python_version>="3.12"
wheel
17 changes: 5 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
'requests >= 2.16.2',
'six >= 1.12.0',
'stone >= 2',
]

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',
'setuptools',
]

# WARNING: This imposes limitations on test/requirements.txt such that the
Expand All @@ -50,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']},
Expand All @@ -71,12 +65,11 @@
'License :: OSI Approved :: MIT License',
'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',
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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{38,39,310,311,312,py,py3},check,lint,docs,test_unit,coverage
skip_missing_interpreters = true

[flake8]
Expand Down Expand Up @@ -41,6 +41,7 @@ commands =

deps =
twine
wheel

usedevelop = true

Expand Down Expand Up @@ -86,4 +87,4 @@ description = invoke sphinx-build to build the HTML docs
extras = docs
commands = sphinx-build -b html docs build/html
deps =
sphinx
sphinx