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

Add Python 3.12 support #407

Merged
merged 2 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
workflow_dispatch:

env:
LATEST_PY_VERSION: '3.11'
LATEST_PY_VERSION: '3.12'
COVERAGE_ARGS: '--cov --cov-report=term --cov-report=xml'

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11']
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
default: 'true'

env:
LATEST_PY_VERSION: '3.11'
LATEST_PY_VERSION: '3.12'

# Required for creating a new release
permissions:
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
DEFAULT_COVERAGE_FORMATS = ['html', 'term']


@session(python=['3.10', '3.11'])
@session(python=['3.10', '3.11', '3.12'])
def test(session):
"""Run tests for a specific python version"""
test_paths = session.posargs or ['test']
Expand Down
2 changes: 1 addition & 1 deletion packaging/build_win.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build pyinstaller package prior to creating Windows installer

# Create virtualenv (if needed)
# python3.11 -m venv $env:USERPROFILE\.virtualenvs\naturtag
# python3.12 -m venv $env:USERPROFILE\.virtualenvs\naturtag

# Install poetry (if needed)
# Invoke-WebRequest -Uri https://install.python-poetry.org -OutFile install-poetry.py
Expand Down
2 changes: 1 addition & 1 deletion packaging/naturtag.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ from pathlib import Path
from PyInstaller.compat import is_darwin, is_linux, is_win
from PyInstaller.utils.hooks import copy_metadata

BUILD_PY_VERSION = '3.11'
BUILD_PY_VERSION = '3.12'
PROJECT_NAME = 'naturtag'
PROJECT_DIR = Path('.').absolute()
ASSETS_DIR = PROJECT_DIR / 'assets'
Expand Down
548 changes: 298 additions & 250 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exclude = [
]

[tool.poetry.dependencies]
python = '>=3.10,<3.12'
python = '>=3.10,<3.13'
attrs = '>=21.2'
click = '>=8.0'
click-help-colors = '>=0.9'
Expand All @@ -44,7 +44,7 @@ pyexiv2 = '>=2.10'
pyinaturalist = '>=0.19'
pyinaturalist-convert = '>=0.6.5'
pyside6 = '^6.7.2'
pyqtdarktheme = '^2.1.0'
pyqtdarktheme-fork = '^2.3.2'
pyyaml = '>=6.0'
qtawesome = '^1.1.1'
sqlalchemy = '^2.0.23'
Expand Down