From 35249d75172af56157e6bed24eb02b8cda0af2b9 Mon Sep 17 00:00:00 2001 From: joda9 Date: Mon, 15 Jul 2024 13:15:42 +0200 Subject: [PATCH 1/7] Update Python versions in tests-coverage workflow --- .github/workflows/tests-coverage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests-coverage.yml b/.github/workflows/tests-coverage.yml index 951972d4d..062ccd035 100644 --- a/.github/workflows/tests-coverage.yml +++ b/.github/workflows/tests-coverage.yml @@ -20,13 +20,13 @@ jobs: include: - name-suffix: "coverage" os: ubuntu-latest - python-version: 3.8 + python-version: 3.9 - name-suffix: "basic" os: ubuntu-latest - python-version: 3.9 + python-version: 3.10 - name-suffix: "basic" os: windows-latest - python-version: 3.8 + python-version: 3.9 steps: - name: Checkout repo @@ -71,7 +71,7 @@ jobs: python -m pytest --runslow --disable-warnings --color=yes -v - name: Run tests, coverage and send to coveralls - if: runner.os == 'Linux' && matrix.python-version == 3.8 && matrix.name-suffix == 'coverage' + if: runner.os == 'Linux' && matrix.python-version == 3.9 && matrix.name-suffix == 'coverage' run: | pip install pytest pytest-notebook coveralls coverage run --source=edisgo -m pytest --runslow --runonlinux --disable-warnings --color=yes -v From 44fbc075b3e8dafe7b80c686491a6fae63a67c9d Mon Sep 17 00:00:00 2001 From: joda9 Date: Mon, 15 Jul 2024 13:18:46 +0200 Subject: [PATCH 2/7] Update Python versions in tests-coverage workflow --- .github/workflows/tests-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-coverage.yml b/.github/workflows/tests-coverage.yml index 062ccd035..0005070a1 100644 --- a/.github/workflows/tests-coverage.yml +++ b/.github/workflows/tests-coverage.yml @@ -23,7 +23,7 @@ jobs: python-version: 3.9 - name-suffix: "basic" os: ubuntu-latest - python-version: 3.10 + python-version: "3.10" - name-suffix: "basic" os: windows-latest python-version: 3.9 From a8c7c2e4f41eb734fc42726d0077a88ae7dfe815 Mon Sep 17 00:00:00 2001 From: joda9 <66819219+joda9@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:31:49 +0200 Subject: [PATCH 3/7] Update dev_notes to python>=3.9 --- doc/dev_notes.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/dev_notes.rst b/doc/dev_notes.rst index 953ae282b..5d7764e48 100644 --- a/doc/dev_notes.rst +++ b/doc/dev_notes.rst @@ -18,8 +18,7 @@ Installation using Linux ~~~~~~~~~~~~~~~~~~~~~~~~ To set up a source installation using linux simply use a virtual environment and install -the source code with pip. Make sure to use python3.7 or higher (recommended -python3.8). **After** setting up your virtual environment and activating it run the +the source code with pip. Make sure to use python3.9 or higher. **After** setting up your virtual environment and activating it run the following commands within your eDisGo directory: .. code-block:: bash From b909a1a7593b4a4fab39e098c5c5763ffe270ccc Mon Sep 17 00:00:00 2001 From: joda9 <66819219+joda9@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:32:35 +0200 Subject: [PATCH 4/7] Update quickstart.rst to python>=3.9 --- doc/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/quickstart.rst b/doc/quickstart.rst index 04f12fbaf..bc537cc44 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -3,7 +3,7 @@ Getting started ================ -.. warning:: Make sure to use python 3.8 or higher! +.. warning:: Make sure to use python 3.9 or higher! Installation using Linux ------------------------- From 88d2c03552a616c346e497086b42743c73fdab7c Mon Sep 17 00:00:00 2001 From: joda9 <66819219+joda9@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:41:53 +0200 Subject: [PATCH 5/7] Update eDisGo_env.yml Updated the python version to >=3.9<3.11 --- eDisGo_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eDisGo_env.yml b/eDisGo_env.yml index 45b797e16..06e2b03e6 100644 --- a/eDisGo_env.yml +++ b/eDisGo_env.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python >= 3.8, < 3.10 + - python >= 3.9, < 3.11 - pip - pandas >= 1.4, < 2.2.0 - conda-forge::fiona From 9b7f53c7604a83ea5263566e5cf9d543d2513de6 Mon Sep 17 00:00:00 2001 From: joda9 <66819219+joda9@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:42:31 +0200 Subject: [PATCH 6/7] Update eDisGo_env_dev.yml Updated the python version to >=3.9<3.11 --- eDisGo_env_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eDisGo_env_dev.yml b/eDisGo_env_dev.yml index ae86632ac..eb9cb30df 100644 --- a/eDisGo_env_dev.yml +++ b/eDisGo_env_dev.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python >= 3.8, < 3.10 + - python >= 3.9, < 3.11 - pip - pandas >= 1.4, < 2.2.0 - conda-forge::fiona From fe017545d436c04db500be784f4798a383d04154 Mon Sep 17 00:00:00 2001 From: joda9 <66819219+joda9@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:43:22 +0200 Subject: [PATCH 7/7] Update setup.py Updated the python version to >=3.9 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b77dba80f..0ccb320b3 100644 --- a/setup.py +++ b/setup.py @@ -4,9 +4,9 @@ from setuptools import find_packages, setup -if sys.version_info[:2] < (3, 8): +if sys.version_info[:2] < (3, 9): error = ( - "eDisGo requires Python 3.8 or later (%d.%d detected)." % sys.version_info[:2] + "eDisGo requires Python 3.9 or later (%d.%d detected)." % sys.version_info[:2] ) sys.stderr.write(error + "\n") sys.exit(1)