From 7f62a043d8979a4a2fb0023feb6fe780d9655665 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 13:25:28 +0200 Subject: [PATCH 01/23] add version tasks --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d43580d..c39f207 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,6 +62,8 @@ test = "pytest --cov=pyrasa --cov-report=lcov" lint = "ruff format && ruff check --fix" lint_ci = "ruff check" check_types = "mypy pyrasa tests" +version_minor = "hatch version minor && hatch version dev" +version_fix = "hatch version fix && hatch version dev" doc_dev = "sphinx-autobuild --ignore 'doc/source/auto_examples/*' doc/source doc/build" build_docs = "cd doc; make clean; make html" From ed1f04841e447ebe5fae57bdd725dfa638b4b10e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:03:55 +0200 Subject: [PATCH 02/23] add build task --- .github/workflows/test.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e9047c..4c6f6b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,4 +53,21 @@ jobs: cache: true locked: false frozen: false - - run: pixi run -e mne check_types \ No newline at end of file + - run: pixi run -e mne check_types + + build: + runs-on: ubuntu-latest + if: { { github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+\.dev[ 0-9 ]+$/' || github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+$/' } } + needs: [test, lint, type_check] + steps: + - uses: actions/checkout@v4 + - uses: prefix-dev/setup-pixi@v0.8.1 + with: + pixi-version: latest + cache: true + locked: false + frozen: false + - run: pixi run hatch build + - uses: actions/upload-artifact@v2 + with: + name: dist \ No newline at end of file From c53cb17442fd9b4e2311b6b5dca4d1ed2bf816f7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:11:25 +0200 Subject: [PATCH 03/23] fix --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c6f6b5..a7dd3c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,6 +68,7 @@ jobs: locked: false frozen: false - run: pixi run hatch build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: - name: dist \ No newline at end of file + name: pyrasa_dist + path: dist/ \ No newline at end of file From 6b480291828381a0c749c3b459e738f26c088b50 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:14:58 +0200 Subject: [PATCH 04/23] test --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7dd3c4..dc2eb1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,7 +57,7 @@ jobs: build: runs-on: ubuntu-latest - if: { { github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+\.dev[ 0-9 ]+$/' || github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+$/' } } + #if: { { github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+\.dev[ 0-9 ]+$/' || github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+$/' } } needs: [test, lint, type_check] steps: - uses: actions/checkout@v4 From 4f0a9582856af151f461710c91779bc7e103b074 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:42:24 +0200 Subject: [PATCH 05/23] fix tags --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dc2eb1a..ae083fa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,9 @@ on: push: branches: - main + tags: + - '/^v[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$/' + - '/^v[0-9]+\.[0-9]+\.[0-9]+$/' pull_request: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -57,7 +60,7 @@ jobs: build: runs-on: ubuntu-latest - #if: { { github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+\.dev[ 0-9 ]+$/' || github.ref ~= '/^refs/tags/v[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+$/' } } + if: ${{ github.ref_type == 'tag' }} needs: [test, lint, type_check] steps: - uses: actions/checkout@v4 From 2845e4a84311b3bd75919d9dc624c7661f9aebda Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:43:31 +0200 Subject: [PATCH 06/23] =?UTF-8?q?Bump=20version=200.1.0.dev0=20=E2=86=92?= =?UTF-8?q?=200.1.0.dev1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 4ae33ef..241095f 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev0' +__version__ = '0.1.0.dev1' From 65ad3c8cfc054c26fe98a2c6dd7348c918e55abd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:44:57 +0200 Subject: [PATCH 07/23] do not require successful tests for now --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ae083fa..121afc5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: build: runs-on: ubuntu-latest if: ${{ github.ref_type == 'tag' }} - needs: [test, lint, type_check] + needs: [lint, type_check] steps: - uses: actions/checkout@v4 - uses: prefix-dev/setup-pixi@v0.8.1 From dbf89fc61f1e0ba901f38da6ca2752270cba244b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:45:02 +0200 Subject: [PATCH 08/23] =?UTF-8?q?Bump=20version=200.1.0.dev1=20=E2=86=92?= =?UTF-8?q?=200.1.0.dev2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 241095f..9798797 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev1' +__version__ = '0.1.0.dev2' From 10f96152d230115aa185ffd88c6aea5f34dcd3d0 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:48:18 +0200 Subject: [PATCH 09/23] fix regex --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 121afc5..d6b7f52 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,8 +4,8 @@ on: branches: - main tags: - - '/^v[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$/' - - '/^v[0-9]+\.[0-9]+\.[0-9]+$/' + - '^v[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$' + - '^v[0-9]+\.[0-9]+\.[0-9]+$' pull_request: concurrency: group: ${{ github.workflow }}-${{ github.ref }} From e1e86447e8a233abeee6532b8b60bf3cb11e067b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:48:30 +0200 Subject: [PATCH 10/23] =?UTF-8?q?Bump=20version=200.1.0.dev2=20=E2=86=92?= =?UTF-8?q?=200.1.0.dev3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 9798797..62a9903 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev2' +__version__ = '0.1.0.dev3' From 08de091abb8d9021191fb33562a85a1f8b68e8ad Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:50:39 +0200 Subject: [PATCH 11/23] adapt to shitty github regex --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6b7f52..1cf593e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,8 +4,8 @@ on: branches: - main tags: - - '^v[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$' - - '^v[0-9]+\.[0-9]+\.[0-9]+$' + - 'v[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+' + - 'v[0-9]+\.[0-9]+\.[0-9]+' pull_request: concurrency: group: ${{ github.workflow }}-${{ github.ref }} From d016dc5dcf80a50c7980765621a662ceab616741 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:50:56 +0200 Subject: [PATCH 12/23] =?UTF-8?q?Bump=20version=200.1.0.dev3=20=E2=86=92?= =?UTF-8?q?=200.1.0.dev4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 62a9903..408c2a9 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev3' +__version__ = '0.1.0.dev4' From 329320f993ac4a9dda7760d8f89feb9931324568 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:57:16 +0200 Subject: [PATCH 13/23] add testpypi upload --- .github/workflows/test.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1cf593e..92533a4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,4 +74,24 @@ jobs: - uses: actions/upload-artifact@v4 with: name: pyrasa_dist - path: dist/ \ No newline at end of file + path: dist/ + + publish_to_testpypi: + runs-on: ubuntu-latest + if: ${{ contains(github.ref, 'dev') }} + needs: [build] + environment: + name: testpypi + url: https://test.pypi.org/p/pyrasa + permissions: + id-token: write + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution 📦 to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ \ No newline at end of file From 557e8009dc81c18868960a546704501b4bc9c3d8 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 14:59:54 +0200 Subject: [PATCH 14/23] =?UTF-8?q?Bump=20version=200.1.0.dev4=20=E2=86=92?= =?UTF-8?q?=200.1.0.dev5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 408c2a9..cf53789 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev4' +__version__ = '0.1.0.dev5' From 236bada7fa340885d12162bf3c474d0ce7e7ccca Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:03:13 +0200 Subject: [PATCH 15/23] fix ci --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92533a4..d6cb0ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,7 +89,7 @@ jobs: - name: Download all the dists uses: actions/download-artifact@v4 with: - name: python-package-distributions + name: pyrasa_dist path: dist/ - name: Publish distribution 📦 to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 From 2e7260ae199947888aca7b9debb2bb78b2b363d1 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:03:18 +0200 Subject: [PATCH 16/23] =?UTF-8?q?Bump=20version=200.1.0.dev5=20=E2=86=92?= =?UTF-8?q?=200.1.0.dev6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index cf53789..372e9f9 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev5' +__version__ = '0.1.0.dev6' From d651531da4b5a0e66ea9e74ef159888159ee71d8 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:10:52 +0200 Subject: [PATCH 17/23] add real publish --- .github/workflows/test.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6cb0ff..376e02b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: build: runs-on: ubuntu-latest if: ${{ github.ref_type == 'tag' }} - needs: [lint, type_check] + needs: [test, lint, type_check] steps: - uses: actions/checkout@v4 - uses: prefix-dev/setup-pixi@v0.8.1 @@ -94,4 +94,24 @@ jobs: - name: Publish distribution 📦 to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - repository-url: https://test.pypi.org/legacy/ \ No newline at end of file + repository-url: https://test.pypi.org/legacy/ + + publish_to_pypi: + runs-on: ubuntu-latest + if: ${{ !contains(github.ref, 'dev') }} + needs: [build] + environment: + name: pypi + url: https://pypi.org/p/pyrasa + permissions: + id-token: write + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: pyrasa_dist + path: dist/ + - name: Publish distribution 📦 to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://pypi.org/legacy/ \ No newline at end of file From d20161667504d3024bb607a78c8c245b3a76060b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:13:35 +0200 Subject: [PATCH 18/23] =?UTF-8?q?Bump=20version=200.1.0.dev6=20=E2=86=92?= =?UTF-8?q?=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 372e9f9..b3740b3 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.1.0.dev6' +__version__ = '0.2.0' From fb0e8d0f7608b5d8478175438e0218b38263f6df Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:13:35 +0200 Subject: [PATCH 19/23] =?UTF-8?q?Bump=20version=200.2.0=20=E2=86=92=200.2.?= =?UTF-8?q?0.dev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index b3740b3..0f90e4f 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.2.0' +__version__ = '0.2.0.dev0' From 1309e3ea576b9777b3193a5602ca17011ec96dbc Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:56:28 +0200 Subject: [PATCH 20/23] fix --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 376e02b..7ef8d9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -112,6 +112,4 @@ jobs: name: pyrasa_dist path: dist/ - name: Publish distribution 📦 to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://pypi.org/legacy/ \ No newline at end of file + uses: pypa/gh-action-pypi-publish@release/v1 \ No newline at end of file From 5afd75960dba8acd2e568ccd5f3f02d19c2e209a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:56:48 +0200 Subject: [PATCH 21/23] =?UTF-8?q?Bump=20version=200.2.0.dev0=20=E2=86=92?= =?UTF-8?q?=200.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index 0f90e4f..bab1fb2 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.2.0.dev0' +__version__ = '0.2.1' From f85fe890bf71a0a759c3c0f7f72b7d2027f2b4eb Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 2 Oct 2024 15:56:49 +0200 Subject: [PATCH 22/23] =?UTF-8?q?Bump=20version=200.2.1=20=E2=86=92=200.2.?= =?UTF-8?q?1.dev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyrasa/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrasa/__version__.py b/pyrasa/__version__.py index bab1fb2..28f81dc 100644 --- a/pyrasa/__version__.py +++ b/pyrasa/__version__.py @@ -1,3 +1,3 @@ """Version information for Pyrasa.""" -__version__ = '0.2.1' +__version__ = '0.2.1.dev0' From 4fbbba98a0a59cc5f6fad44cbeec2410e8ea3dc4 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 3 Oct 2024 10:14:25 +0200 Subject: [PATCH 23/23] updated the pixi lock file --- pixi.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixi.lock b/pixi.lock index cf55c6e..0598d20 100644 --- a/pixi.lock +++ b/pixi.lock @@ -28852,9 +28852,9 @@ packages: timestamp: 1714681228438 - kind: pypi name: pyrasa - version: 0.1.0.dev0 + version: 0.2.1.dev0 path: . - sha256: 9c910a0825df39bd81911a2f9504165130ce026f960e2795498ccc7007842744 + sha256: 7fc8fb584c3677fad978d3ec31cf714098474de706e4595b05ef6491fe0160bc requires_dist: - attrs - numpy