diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index 9dad1d45e..7bb125a4d 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -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 diff --git a/.github/workflows/test_runner.yml b/.github/workflows/test_runner.yml index 5ca43dedb..f215ca599 100644 --- a/.github/workflows/test_runner.yml +++ b/.github/workflows/test_runner.yml @@ -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 @@ -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 @@ -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: @@ -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 diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index b4c6d6865..000000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -black == 21.12b0 -pre-commit == 2.0.1 -PyYAML >= 5.4 -pylint >= 2.3.0 -setuptools >=64 -setuptools_scm[toml] >= 6.2 -build -wheel >=0.36.2 -twine >= 3.4.1 -coverage[toml] -pyperf --r "docs/requirements.txt" diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index a80a2762e..000000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -markupsafe < 2.1 # Jinja2<3.0 tries to import soft_unicode, which has been removed in markupsafe 2.1 -jinja2 < 3.0 # Dagster 0.12.8 requires Jinja2<3.0 -docutils < 0.17 -sphinx < 5.2 -sphinx_rtd_theme -recommonmark -astroid < 3.0 # sphinx-autoapi installs the latest astroid. We are not compatible with astroid v3.0 -sphinx-autoapi < 2.1 # 2.1 removed support for sphinx < 5.2.0 diff --git a/pyproject.toml b/pyproject.toml index e62a04d4c..0fd6b0846 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", @@ -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" diff --git a/requirements.txt b/requirements.txt index 711d9ec77..93ee2dc10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 .