Skip to content

Commit

Permalink
1.1.5, support numpy/py more versions
Browse files Browse the repository at this point in the history
  • Loading branch information
tmtenbrink committed Apr 3, 2024
1 parent c273638 commit 76eb357
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout rustfrc
uses: actions/checkout@v2
uses: actions/checkout@v4
# Set up the repository with the Docker container action, which will allow us to build and run a manylinux Docker
# container that will ensure compatibility. See the action repository for more info.
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
id: setup-py
with:
python-version: ${{ matrix.py-version }}

Expand All @@ -33,17 +34,18 @@ jobs:
with:
tool: maturin

# poetry update will install all dependencies for our package, as well as maturin, which we use as our build
# back-end
# poetry update will install all dependencies for our package
- name: Poetry install
run: poetry install --sync --no-root
run: |
poetry env use '${{ steps.setup-py.outputs.python-path }}'
poetry install --sync --no-root
working-directory: ${{ github.workspace }}

- name: Test lower version
if: ${{ matrix.py-version == '3.8' }}
run: |
. $(poetry env info --path)/bin/activate
pip install numpy==1.18.0
pip install numpy==1.18.0 --only-binary true
working-directory: ${{ github.workspace }}

- name: maturin develop
Expand All @@ -68,8 +70,8 @@ jobs:
matrix:
py-version: [ '3.9', '3.10', '3.11', '3.12' ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py-version }}
# The x86_64 Rust toolchain is installed on GitHub runners, but since we compile also for Apple Silicon, we also
Expand All @@ -96,8 +98,8 @@ jobs:
matrix:
py-version: ['3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py-version }}
- name: Build wheels
Expand All @@ -119,8 +121,8 @@ jobs:
matrix:
py-version: [ '3.9', '3.10', '3.11', '3.12' ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py-version }}
- name: Build wheels
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.1.5 2024-04-03

* **Reintroduce Python 3.8, Numpy 1.18+ support**: Turned out it was unnecessary to drop all older versions.

## 1.1.4 2024-04-03

* **Drop Python 3.7, 3.8 support**: Note that this is technically a breaking change, but 1.1.3 works just fine for older versions and this doesn't include much else. This is necessary to use NumPy 1.26, which is required for Python >=3.12.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustfrc"
version = "1.1.4"
version = "1.1.5"
edition = "2021"

[lib]
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# rustfrc

### v1.1.4 requires NumPy v1.26+ (in order to support Python 3.12) and Python 3.9+. For earlier versions, downgrade to v1.1.3.

![GitHub release](https://flat.badgen.net/github/release/tmtenbrink/rustfrc)
![License](https://flat.badgen.net/github/license/tmtenbrink/rustfrc)

Expand All @@ -19,10 +17,8 @@ Furthermore, there are also (since version 1.1) `sqr_abs(a: ndarray) -> ndarray`

## Requirements

* Python 3.9-3.12
* NumPy 1.26 or greater

If you are on Python 3.7-3.11 or are using an earlier version of NumPy, use `v1.1.3` instead.
* Python 3.8-3.12
* NumPy 1.18+ (exact version might depend on Python version, e.g. Python 3.12 requires NumPy 1.26)

## Performance

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "rustfrc"
version = "1.1.4"
version = "1.1.5"
description = "Fast utility functions useful for Fourier Ring/Shell Correlation: binom_split, pois_gen, square_abs."
readme = "README.md"
requires-python = ">=3.8, <3.13"
Expand All @@ -24,7 +24,7 @@ Source = "https://github.com/tmtenbrink/rustfrc"

[tool.poetry]
name = "rustfrc"
version = "1.1.4"
version = "1.1.5"
description = "Fast utility functions useful for Fourier Ring/Shell Correlation: binomial splitting of arrays."
authors = ["Tip ten Brink <[email protected]>"]

Expand Down

0 comments on commit 76eb357

Please sign in to comment.