Skip to content

Commit

Permalink
Merge branch 'hotfix/v2.14.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
vogt31337 committed Mar 27, 2024
2 parents 728ba4a + 8001b36 commit de9db34
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/github_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
group: [ 1, 2 ]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
#- uses: julia-actions/[email protected]
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down Expand Up @@ -71,9 +71,9 @@ jobs:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down Expand Up @@ -108,9 +108,9 @@ jobs:
python-version: ['3.10']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down Expand Up @@ -141,9 +141,9 @@ jobs:
# python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install dependencies
Expand Down Expand Up @@ -172,9 +172,9 @@ jobs:
matrix:
python-version: ['3.9']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -200,9 +200,9 @@ jobs:
matrix:
python-version: [ '3.9' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Check docs for Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/upload_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ name: upload
on:
# Allows you to run this workflow manually from the Actions tab
push:
tags:
- 'v*'
branches:
- master

Expand All @@ -25,7 +23,7 @@ jobs:
- uses: actions/checkout@v4

# Sets up python3
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
# Installs and upgrades pip, installs other dependencies and installs the package from setup.py
Expand All @@ -38,7 +36,6 @@ jobs:
# Upload to PyPI
- name: Build and Upload to PyPI
if: inputs.upload_server == 'pypi'
run: |
python3 setup.py sdist --formats=zip
twine check dist/* --strict
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

setup(
name='pandapower',
version='2.14.0',
version='2.14.1',
author='Leon Thurner, Alexander Scheidler',
author_email='[email protected], [email protected]',
description='An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.',
Expand Down

0 comments on commit de9db34

Please sign in to comment.