Skip to content

Commit

Permalink
Enable support for Python 3.12
Browse files Browse the repository at this point in the history
Also, cleaned up dependencies after Dagster removal.
We now favor pyproject.toml for developer dependencies;
dev-requirements.txt and docs/requirements.txt files have been removed.

Re #2522
  • Loading branch information
soininen committed Apr 25, 2024
1 parent 4dbce2c commit 6c65e92
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: |
mkdir embedded-python
cd embedded-python
curl -o python.zip https://www.python.org/ftp/python/3.11.9/python-3.11.9-embed-amd64.zip
curl -o python.zip https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip
tar xf python.zip
del python.zip
- name: Build bundle
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/test_runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: [3.8, 3.9, "3.10", 3.11]
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
os: [windows-latest, ubuntu-22.04]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -48,16 +48,10 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install -e .[dev]
- name: List packages
run:
python -m pip list
- name: Install python3 kernelspecs
run: |
python -m pip install ipykernel
python -m ipykernel install --user
- name: Install coverage
run:
python -m pip install coverage[toml]
- name: Run tests
run: |
if [ "$RUNNER_OS" != "Windows" ]; then
Expand All @@ -75,7 +69,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", 3.11]
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
os: [windows-latest, ubuntu-22.04]
# needs: unit-tests
steps:
Expand All @@ -99,6 +93,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install -e .[dev]
- name: List packages
run:
python -m pip list
Expand Down
12 changes: 0 additions & 12 deletions dev-requirements.txt

This file was deleted.

8 changes: 0 additions & 8 deletions docs/requirements.txt

This file was deleted.

16 changes: 14 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ classifiers = [
"License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
"Operating System :: OS Independent",
]
requires-python = ">=3.8.1, <3.12"
requires-python = ">=3.8.1"
dependencies = [
"pyside6 >= 6.5.0, != 6.5.3, != 6.6.3",
"jupyter-client >=6.0",
"qtconsole >=5.1",
"sqlalchemy >=1.3",
"spinedb_api>=0.30.0",
"spine_engine>=0.23.0",
"numpy >=1.20.2",
Expand All @@ -34,6 +33,19 @@ dependencies = [
Documentation = "https://spine-toolbox.readthedocs.io/"
Repository = "https://github.com/spine-tools/Spine-Toolbox"

[project.optional-dependencies]
dev = [
"coverage[toml]",
"black == 21.12b0",
"pre-commit == 2.0.1",
"pylint",
"pyperf",
"sphinx",
"sphinx_rtd_theme",
"sphinx-autoapi",
"recommonmark",
]

[project.scripts]
spinetoolbox = "spinetoolbox.main:main"
spine-db-editor = "spinetoolbox.spine_db_editor.main:main"
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-e git+https://github.com/spine-tools/Spine-Database-API.git@0.8-dev#egg=spinedb_api
-e git+https://github.com/spine-tools/spine-engine.git@0.8-dev#egg=spine_engine
-e git+https://github.com/spine-tools/spine-items.git@0.8-dev#egg=spine_items
-e git+https://github.com/spine-tools/Spine-Database-API.git@toolbox_2522_enable_python_3.12#egg=spinedb_api
-e git+https://github.com/spine-tools/spine-engine.git@toolbox_2522_enable_python_3.12#egg=spine_engine
-e git+https://github.com/spine-tools/spine-items.git@2522_enable_python_3.12#egg=spine_items
-e .

0 comments on commit 6c65e92

Please sign in to comment.