From 8943b400c9ee1a0c5421398bbde6a82f1f84058d Mon Sep 17 00:00:00 2001 From: hkoertge <2981026+KS-HTK@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:10:55 +0100 Subject: [PATCH 1/3] added dev1 to version --- pandapower/_version.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandapower/_version.py b/pandapower/_version.py index a3a3d8636..a399734d3 100644 --- a/pandapower/_version.py +++ b/pandapower/_version.py @@ -1,4 +1,4 @@ import importlib.metadata __version__ = importlib.metadata.version("pandapower") -__format_version__ = "3.0.0" +__format_version__ = "3.0.0dev1" diff --git a/pyproject.toml b/pyproject.toml index 0851e7cd6..354c81959 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pandapower" -version = "3.0.0" # File format version '__format_version__' is tracked in _version.py +version = "3.0.0dev1" # File format version '__format_version__' is tracked in _version.py authors = [ { name = "Leon Thurner", email = "leon.thurner@retoflow.de" }, { name = "Alexander Scheidler", email = "alexander.scheidler@iee.fraunhofer.de" } From e790bc6a9f0bab2682551b6c4acb8f2b94c2e627 Mon Sep 17 00:00:00 2001 From: hkoertge <2981026+KS-HTK@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:28:09 +0100 Subject: [PATCH 2/3] updated upload_release.yml to use a workflow dispatch and include possibility to upload to testpypi --- .github/workflows/upload_release.yml | 30 +++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upload_release.yml b/.github/workflows/upload_release.yml index 863a8bb47..b0188225e 100644 --- a/.github/workflows/upload_release.yml +++ b/.github/workflows/upload_release.yml @@ -6,9 +6,16 @@ name: upload # Controls when the action will run. on: # Allows you to run this workflow manually from the Actions tab - push: - branches: - - master + workflow_dispatch: + inputs: + upload_server: + description: 'upload server' + required: true + default: 'testpypi' + type: choice + options: + - 'testpypi' + - 'pypi' # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -31,10 +38,23 @@ jobs: # Upgrade pip python3 -m pip install --upgrade pip # Install twine - python3 -m pip install setuptools wheel twine + python3 -m pip install build setuptools wheel twine + + # Upload to TestPyPI + - name: Build and Upload to TestPyPI + if: ${{ inputs.upload_server == 'testpypi' }} + run: | + python3 -m build + python3 -m twine check dist/* --strict + python3 -m twine upload dist/* + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.TESTPYPI }} + TWINE_REPOSITORY: testpypi # Upload to PyPI - name: Build and Upload to PyPI + if: ${{ inputs.upload_server == 'pypi' }} run: | python3 -m build python3 -m twine check dist/* --strict @@ -59,7 +79,7 @@ jobs: ref_name: develop - # Run an install for testing + # Run an installation for testing - name: Install pandapower from PyPI run: | python3 -m pip install pandapower From 05f46d49696e6d175af7c1b421889a3bf9c04786 Mon Sep 17 00:00:00 2001 From: hkoertge <2981026+KS-HTK@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:41:16 +0100 Subject: [PATCH 3/3] fixed version identifier missing a dot. --- pandapower/_version.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandapower/_version.py b/pandapower/_version.py index a399734d3..8ea6e701a 100644 --- a/pandapower/_version.py +++ b/pandapower/_version.py @@ -1,4 +1,4 @@ import importlib.metadata __version__ = importlib.metadata.version("pandapower") -__format_version__ = "3.0.0dev1" +__format_version__ = "3.0.0.dev0" diff --git a/pyproject.toml b/pyproject.toml index 354c81959..5d19789f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pandapower" -version = "3.0.0dev1" # File format version '__format_version__' is tracked in _version.py +version = "3.0.0.dev0" # File format version '__format_version__' is tracked in _version.py authors = [ { name = "Leon Thurner", email = "leon.thurner@retoflow.de" }, { name = "Alexander Scheidler", email = "alexander.scheidler@iee.fraunhofer.de" }