Skip to content

Commit

Permalink
Fix/remove 3 7 (#555)
Browse files Browse the repository at this point in the history
* REMOVE Python 3.7 from test pipeline due to inconsistencies with pandapower

---------

Co-authored-by: Jolando Kisse <[email protected]>
  • Loading branch information
EPrade and jkisse authored Jul 31, 2023
1 parent c320051 commit 59cf3c3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
needs: upload
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']
os: [ ubuntu-latest, windows-latest ]
steps:
- name: Set up Python ${{ matrix.python-version }}
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/run_tests_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -30,11 +30,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest igraph pytest-split numba
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if ${{ matrix.python-version == '3.7' }};
then pip install pandapower==2.11.1;
else
python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
fi
pip install .
- name: List all installed packages
run: |
Expand Down Expand Up @@ -90,7 +86,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -102,11 +98,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest nbmake pytest-xdist pytest-split igraph numba
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if ${{ matrix.python-version == '3.7' }};
then pip install pandapower==2.11.1;
else
python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
fi
pip install .
- name: List all installed packages
run: |
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/run_tests_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand All @@ -30,11 +30,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest igraph pytest-split numba
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if ${{ matrix.python-version == '3.7' }};
then pip install pandapower==2.11.1;
else
python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
fi
pip install .
- name: List all installed packages
run: |
Expand All @@ -58,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -70,11 +66,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pytest nbmake pytest-xdist pytest-split igraph numba
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if ${{ matrix.python-version == '3.7' }};
then pip install pandapower==2.11.1;
else
python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
fi
pip install .
- name: List all installed packages
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Change Log
- [FIXED] np.bool error in pipeflow calculation due to deprecation of np.bool
- [FIXED] use igraph package instead of python-igraph (has been renamed)
- [ADDED] gas specific calculation of heat capacity ration kappa = cp/cv (for pumps/compressors)
- [REMOVED] Python 3.7 removed from test pipeline due to inconsistencies with pandapower

[0.8.4] - 2023-02-02
-------------------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

with open('.github/workflows/run_tests_master.yml', 'rb') as f:
lines = f.read().decode('utf-8')
versions = set(re.findall('3.[7-9]', lines)) | set(re.findall('3.1[0-9]', lines))
versions = set(re.findall('3.[8-9]', lines)) | set(re.findall('3.1[0-9]', lines))
for version in versions:
classifiers.append('Programming Language :: Python :: %s' % version)

Expand Down

0 comments on commit 59cf3c3

Please sign in to comment.