Skip to content

Commit

Permalink
Merge pull request #407 from openego/maintanance/github-tests-for-pyt…
Browse files Browse the repository at this point in the history
…hon-3.10

Maintanance/GitHub tests for python 3.10
  • Loading branch information
birgits authored Jul 15, 2024
2 parents a65ccdf + fe01754 commit 583c4f6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/tests-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions doc/dev_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------------
Expand Down
2 changes: 1 addition & 1 deletion eDisGo_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eDisGo_env_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 583c4f6

Please sign in to comment.