Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge Fourier method into main #23

Merged
merged 10 commits into from
Aug 8, 2024
Merged

merge Fourier method into main #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc167a6
Add Fourier method
LSchueler Jul 2, 2024
4531f19
Fix formatting
LSchueler Jul 2, 2024
df81b39
Update Py version for actions
LSchueler Jul 2, 2024
93194aa
Update min. Py ABI version
LSchueler Jul 2, 2024
91b62bd
Update dep. versions
LSchueler Jul 2, 2024
60ce7d5
Update versions of Python dependencies
LSchueler Jul 2, 2024
2c91615
Fix yaml interpreting semvar as float
LSchueler Jul 2, 2024
78621e9
Include intel & arm architecture for macos
LSchueler Jul 2, 2024
df8f2a5
Update action versions
LSchueler Jul 2, 2024
6bb55fb
Bump version
LSchueler Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
name: Setup Rust
with:
Expand Down Expand Up @@ -47,10 +47,10 @@ jobs:
matrix:
target: [x86_64, i686]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: '3.10'
architecture: x64
- name: Build Wheels
uses: messense/maturin-action@v1
Expand All @@ -64,7 +64,7 @@ jobs:
pip install gstools-core --no-index --find-links dist --force-reinstall --no-deps
python -c "import gstools_core"
- name: Upload Wheels Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: dist

Expand All @@ -75,10 +75,10 @@ jobs:
matrix:
target: [x64, x86]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: '3.10'
architecture: ${{ matrix.target }}
- name: Install Rust Toolchain
uses: actions-rs/toolchain@v1
Expand All @@ -96,31 +96,39 @@ jobs:
pip install gstools-core --no-index --find-links dist --force-reinstall --no-deps
python -c "import gstools_core"
- name: Upload Wheels Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: dist

macos:
needs: [check]
runs-on: macos-latest
strategy:
matrix:
os: [macos-13, macos-14]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9
architecture: x64
python-version: '3.10'
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
default: true
- name: Build wheels - x86_64
if: matrix.os == 'macos-13'
uses: messense/maturin-action@v1
with:
target: x86_64
args: --release --out dist
- name: Install built wheel - x86_64
- name: Build wheels - arm64
uses: messense/maturin-action@v1
with:
target: aarch64-apple-darwin
args: --release --out dist
- name: Install built wheel
run: |
pip install gstools-core --no-index --find-links dist --force-reinstall --no-deps
python -c "import gstools_core"
Expand All @@ -133,18 +141,18 @@ jobs:
pip install gstools-core --no-index --find-links dist --force-reinstall --no-deps
python -c "import gstools_core"
- name: Upload wheels
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: dist

sdist:
needs: [check]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: '3.10'
architecture: x64
- name: Install dependencies
run: |
Expand All @@ -154,7 +162,7 @@ jobs:
run: |
# PEP 517 package builder from pypa
python -m build --sdist
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: dist

Expand All @@ -163,7 +171,7 @@ jobs:
needs: [linux, windows, macos, sdist]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist
Expand Down
Loading
Loading