From 1d4c9d4c750919af8011a89ff6c48c209384cbfb Mon Sep 17 00:00:00 2001 From: Antti Soininen Date: Thu, 25 Apr 2024 15:59:20 +0300 Subject: [PATCH] Temporarily require feature branch of other Spine repos. Re spine-tools/Spine-Toolbox#2522 --- .github/workflows/run_unit_tests.yml | 6 +++--- dev-requirements.txt | 1 + pyproject.toml | 3 --- requirements.txt | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 dev-requirements.txt diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 4d73b425..2b0b9375 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -26,8 +26,9 @@ jobs: python-version: ${{ matrix.python-version }} cache: pip cache-dependency-path: | - requirements.txt pyproject.toml + requirements.txt + dev-requirements.txt - name: Display Python version run: python -c "import sys; print(sys.version)" @@ -41,9 +42,8 @@ jobs: PYTHONUTF8: 1 run: | python -m pip install --upgrade pip - python -m pip install --no-deps -e . python -m pip install -r requirements.txt - python -m pip install -e .[dev] + python -m pip install -r dev-requirements.txt - name: List packages run: pip list diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 00000000..80de8a36 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1 @@ +coverage[toml] diff --git a/pyproject.toml b/pyproject.toml index 5fb6f322..85a79d99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,9 +21,6 @@ dependencies = [ [project.urls] Repository = "https://github.com/spine-tools/spine-items" -[project.optional-dependencies] -dev = ["coverage[toml]"] - [build-system] requires = ["setuptools>=64", "setuptools_scm[toml]>=6.2", "wheel", "build"] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 51082f94..c7002be8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ --e git+https://github.com/spine-tools/Spine-Database-API.git#egg=spinedb_api --e git+https://github.com/spine-tools/spine-engine.git#egg=spine_engine --e git+https://github.com/spine-tools/Spine-Toolbox.git#egg=spinetoolbox +-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-Toolbox.git@2522_enable_python_3.12#egg=spinetoolbox -e .