From f4a99892cbe016346cb92ddd2ef1000de8fcc53d Mon Sep 17 00:00:00 2001 From: jeroen Date: Tue, 28 Jan 2025 08:43:49 +0100 Subject: [PATCH 01/18] release 0.1.4 --- .github/workflows/ci-tsdownsample.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index a27a82c..7a63126 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -97,7 +97,7 @@ jobs: # Perhaps smth more in line with this https://github.com/messense/crfs-rs/blob/main/.github/workflows/Python.yml name: build on ${{ matrix.os }} (${{ matrix.target }} - ${{ matrix.manylinux || 'auto' }}) # only run on push to main and on release - if: "success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Full Build'))" + # if: "success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Full Build'))" strategy: fail-fast: false matrix: @@ -176,7 +176,7 @@ jobs: Release: needs: [Lint_and_Check, Test, Build] - if: "success() && startsWith(github.ref, 'refs/tags/')" + # if: "success() && startsWith(github.ref, 'refs/tags/')" runs-on: ubuntu-latest steps: From 691e2ae080665774728cbafc47472c39bae8494c Mon Sep 17 00:00:00 2001 From: jeroen Date: Tue, 28 Jan 2025 09:10:52 +0100 Subject: [PATCH 02/18] :pray: update actions --- .github/workflows/ci-tsdownsample.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index 7a63126..c385641 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -62,8 +62,8 @@ jobs: PYTHON: ${{ matrix.python-version }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - run: pip install -r tests/requirements.txt @@ -91,7 +91,7 @@ jobs: - run: make test # Test Python - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 Build: # Perhaps smth more in line with this https://github.com/messense/crfs-rs/blob/main/.github/workflows/Python.yml From 448992c871f4cbe55f1abb571bd9ffad444ee2b8 Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 12:40:13 +0100 Subject: [PATCH 03/18] add python 3.13 to ci build --- .github/workflows/ci-tsdownsample.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index c385641..e0c5a60 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -147,9 +147,9 @@ jobs: - name: set up python uses: actions/setup-python@v4 - # with: - # python-version: '3.11' - # architecture: ${{ matrix.python-architecture || 'x64' }} + with: + python-version: '3.13' + architecture: ${{ matrix.python-architecture || 'x64' }} - name: build sdist if: ${{ matrix.os == 'ubuntu' && matrix.target == 'x86_64' && matrix.manylinux == 'auto' }} @@ -165,7 +165,7 @@ jobs: target: ${{ matrix.target }} manylinux: ${{ matrix.manylinux || 'auto' }} container: ${{ matrix.container }} - args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12' }} + args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12 3.13' }} - run: ${{ matrix.ls || 'ls -lh' }} dist/ From 3a865f6905300a403d4cba92d11e2723704db0f2 Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 13:16:51 +0100 Subject: [PATCH 04/18] :pray: install python 3.7 besides 3.13 --- .github/workflows/ci-tsdownsample.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index e0c5a60..b12ee0b 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -148,7 +148,9 @@ jobs: - name: set up python uses: actions/setup-python@v4 with: - python-version: '3.13' + python-version: | + 3.7 + 3.13 architecture: ${{ matrix.python-architecture || 'x64' }} - name: build sdist From e9daf0c60ef62f84706b11c9f0623fbd872eda2b Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 13:20:36 +0100 Subject: [PATCH 05/18] :pray: --- .github/workflows/ci-tsdownsample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index b12ee0b..9756054 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -146,7 +146,7 @@ jobs: - uses: actions/checkout@v3 - name: set up python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: | 3.7 From e5481854f526593f944ad9dc34592cf566572d3e Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 13:25:36 +0100 Subject: [PATCH 06/18] :broom: --- .github/workflows/ci-tsdownsample.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index 9756054..fba5a53 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -148,9 +148,7 @@ jobs: - name: set up python uses: actions/setup-python@v5 with: - python-version: | - 3.7 - 3.13 + python-version: 3.13 architecture: ${{ matrix.python-architecture || 'x64' }} - name: build sdist From bdea529ce556360d61292bd4572c7c2c3cf08dfe Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 20:26:20 +0100 Subject: [PATCH 07/18] drop python 3.7 support --- .github/workflows/ci-tsdownsample.yml | 14 ++------------ pyproject.toml | 3 +-- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index fba5a53..8295ac9 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -46,17 +46,7 @@ jobs: matrix: os: ['windows-latest', 'macOS-latest', 'ubuntu-latest'] rust: ['nightly'] # ['stable', 'beta'] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', "3.13"] - exclude: # Python < 3.8 is not supported on Apple Silicon ARM64 - - os: macOS-latest - python-version: '3.7' - - os: ubuntu-latest - python-version: '3.7' - include: # So run on older version on Intel CPU - - os: macOS-13 - python-version: '3.7' - - os: ubuntu-22.04 - python-version: '3.7' + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', "3.13"] env: PYTHON: ${{ matrix.python-version }} @@ -165,7 +155,7 @@ jobs: target: ${{ matrix.target }} manylinux: ${{ matrix.manylinux || 'auto' }} container: ${{ matrix.container }} - args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12 3.13' }} + args: --release --out dist --interpreter ${{ matrix.interpreter || '3.8 3.9 3.10 3.11 3.12 3.13' }} - run: ${{ matrix.ls || 'ls -lh' }} dist/ diff --git a/pyproject.toml b/pyproject.toml index 8598639..d87a899 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "maturin" name = "tsdownsample" description = "Time series downsampling in rust" version = "0.1.4" -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = ["numpy"] authors = [{name = "Jeroen Van Der Donckt"}] readme = "README.md" @@ -16,7 +16,6 @@ classifiers = [ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', From bc54c44d6a0fc5de141f5713a9c1c005ed0885aa Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 20:44:25 +0100 Subject: [PATCH 08/18] :pray: --- .github/workflows/ci-tsdownsample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index 8295ac9..c91185a 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -177,7 +177,7 @@ jobs: # with: # python-version: '3.10' - - run: pip install -U twine + - run: pip install -U twine packaging - name: get dist artifacts uses: actions/download-artifact@v3 From ed8cae45d6630b8c3058a9e042d54498f3324b1a Mon Sep 17 00:00:00 2001 From: jvdd Date: Tue, 28 Jan 2025 22:57:23 +0100 Subject: [PATCH 09/18] :pray: update download-artifacts --- .github/workflows/ci-tsdownsample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index c91185a..89ce70a 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -180,7 +180,7 @@ jobs: - run: pip install -U twine packaging - name: get dist artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: pypi_files path: dist From cf48133621788d3b89472256d3d986d15113f94c Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 09:19:34 +0100 Subject: [PATCH 10/18] :pray: update upload artifact --- .github/workflows/ci-tsdownsample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index 89ce70a..b78bac4 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -159,7 +159,7 @@ jobs: - run: ${{ matrix.ls || 'ls -lh' }} dist/ - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: pypi_files path: dist From bdcc9b2e8453247332d2e971571f8b079d816e9d Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 09:31:21 +0100 Subject: [PATCH 11/18] :pray: --- .github/workflows/ci-tsdownsample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index b78bac4..e9efac6 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -162,7 +162,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: pypi_files - path: dist + path: dist/* Release: needs: [Lint_and_Check, Test, Build] From 1dc33789b43f987ae82a762484283589cbfcb597 Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 10:35:49 +0100 Subject: [PATCH 12/18] :pray: unique file name --- .github/workflows/ci-tsdownsample.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index e9efac6..7d53cca 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -161,8 +161,8 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: pypi_files - path: dist/* + name: pypi_files-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.interpreter || 'all' }}-${{ matrix.manylinux || 'auto' }} + path: dist Release: needs: [Lint_and_Check, Test, Build] @@ -182,7 +182,7 @@ jobs: - name: get dist artifacts uses: actions/download-artifact@v4 with: - name: pypi_files + name: pypi_files-* path: dist - run: twine check dist/* From a6598b5419dae7eeb74fc88aa13a0a30a072b49d Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 10:51:46 +0100 Subject: [PATCH 13/18] :pray: --- .github/workflows/ci-tsdownsample.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index 7d53cca..51717e9 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -183,6 +183,7 @@ jobs: uses: actions/download-artifact@v4 with: name: pypi_files-* + merge-multiple: true path: dist - run: twine check dist/* From 34865633192cd11f04c7075aef334f547f4345fc Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 11:12:02 +0100 Subject: [PATCH 14/18] :see_no_evil: use pattern --- .github/workflows/ci-tsdownsample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index 51717e9..fc556e4 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -182,7 +182,7 @@ jobs: - name: get dist artifacts uses: actions/download-artifact@v4 with: - name: pypi_files-* + pattern: pypi_files-* merge-multiple: true path: dist From c1e76af455349b92a8dc8ba83adc7707bb874db3 Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 13:32:36 +0100 Subject: [PATCH 15/18] :pray: --- pyproject.toml | 2 +- tsdownsample/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d87a899..876db6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "maturin" [project] name = "tsdownsample" description = "Time series downsampling in rust" -version = "0.1.4" +version = "0.1.4.1" requires-python = ">=3.8" dependencies = ["numpy"] authors = [{name = "Jeroen Van Der Donckt"}] diff --git a/tsdownsample/__init__.py b/tsdownsample/__init__.py index b874022..bfed60a 100644 --- a/tsdownsample/__init__.py +++ b/tsdownsample/__init__.py @@ -11,7 +11,7 @@ NaNMinMaxLTTBDownsampler, ) -__version__ = "0.1.4" +__version__ = "0.1.4.1" __author__ = "Jeroen Van Der Donckt" __all__ = [ From a510a488d40d4948328ff28f9f71849278586b4e Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 13:34:07 +0100 Subject: [PATCH 16/18] :pray: try release candidate --- pyproject.toml | 2 +- tsdownsample/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 876db6e..5b857bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "maturin" [project] name = "tsdownsample" description = "Time series downsampling in rust" -version = "0.1.4.1" +version = "0.1.4.1rc0" requires-python = ">=3.8" dependencies = ["numpy"] authors = [{name = "Jeroen Van Der Donckt"}] diff --git a/tsdownsample/__init__.py b/tsdownsample/__init__.py index bfed60a..9810d85 100644 --- a/tsdownsample/__init__.py +++ b/tsdownsample/__init__.py @@ -11,7 +11,7 @@ NaNMinMaxLTTBDownsampler, ) -__version__ = "0.1.4.1" +__version__ = "0.1.4.1rc0" __author__ = "Jeroen Van Der Donckt" __all__ = [ From 81dbc7e2bfae1a5e55ff1f26cdfc3a6d18be7ba5 Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 13:57:26 +0100 Subject: [PATCH 17/18] :tada: 0.1.4.1 --- pyproject.toml | 2 +- tsdownsample/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5b857bb..876db6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "maturin" [project] name = "tsdownsample" description = "Time series downsampling in rust" -version = "0.1.4.1rc0" +version = "0.1.4.1" requires-python = ">=3.8" dependencies = ["numpy"] authors = [{name = "Jeroen Van Der Donckt"}] diff --git a/tsdownsample/__init__.py b/tsdownsample/__init__.py index 9810d85..bfed60a 100644 --- a/tsdownsample/__init__.py +++ b/tsdownsample/__init__.py @@ -11,7 +11,7 @@ NaNMinMaxLTTBDownsampler, ) -__version__ = "0.1.4.1rc0" +__version__ = "0.1.4.1" __author__ = "Jeroen Van Der Donckt" __all__ = [ From d07758d10c18732732683922f8f99151036d6bb9 Mon Sep 17 00:00:00 2001 From: jvdd Date: Wed, 29 Jan 2025 14:24:31 +0100 Subject: [PATCH 18/18] :broom: --- .github/workflows/ci-tsdownsample.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tsdownsample.yml b/.github/workflows/ci-tsdownsample.yml index fc556e4..afcff60 100644 --- a/.github/workflows/ci-tsdownsample.yml +++ b/.github/workflows/ci-tsdownsample.yml @@ -87,7 +87,7 @@ jobs: # Perhaps smth more in line with this https://github.com/messense/crfs-rs/blob/main/.github/workflows/Python.yml name: build on ${{ matrix.os }} (${{ matrix.target }} - ${{ matrix.manylinux || 'auto' }}) # only run on push to main and on release - # if: "success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Full Build'))" + if: "success() && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Full Build'))" strategy: fail-fast: false matrix: @@ -166,7 +166,7 @@ jobs: Release: needs: [Lint_and_Check, Test, Build] - # if: "success() && startsWith(github.ref, 'refs/tags/')" + if: "success() && startsWith(github.ref, 'refs/tags/')" runs-on: ubuntu-latest steps: