Skip to content

Commit 0e5595c

Browse files
authored
Merge branch 'atcollab:master' into master
2 parents 1fcc51a + 8620504 commit 0e5595c

File tree

260 files changed

+22470
-5667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+22470
-5667
lines changed

.github/workflows/build-python-wheels.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
matrix:
16-
os: [ubuntu-22.04, macos-12, windows-2022]
16+
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
1717

1818
steps:
1919
- uses: actions/checkout@v4
@@ -22,18 +22,18 @@ jobs:
2222
# see: https://github.com/pypa/setuptools_scm/issues/480
2323
fetch-depth: 0
2424

25-
- name: Install Python
25+
- name: Set up Python 3.12
2626
uses: actions/setup-python@v5
2727
with:
28-
python-version: '3.9'
28+
python-version: 3.12
2929

3030
- name: Build wheels
31-
uses: pypa/cibuildwheel@v2.16.2
31+
uses: pypa/cibuildwheel@v2.22
3232

3333
- name: Upload wheels
34-
uses: actions/upload-artifact@v3
34+
uses: actions/upload-artifact@v4
3535
with:
36-
name: wheels
36+
name: wheels-${{ matrix.os }}
3737
path: ./wheelhouse/*.whl
3838
if-no-files-found: error
3939

@@ -59,7 +59,7 @@ jobs:
5959
run: python -m build --sdist
6060

6161
- name: Upload sdist
62-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
6363
with:
6464
name: tar.gz
6565
path: ./dist/*.tar.gz

.github/workflows/docs.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Deploy static content to Pages
2+
3+
on:
4+
# Runs on pushes targeting the default branch
5+
push:
6+
branches: ["master"]
7+
8+
# Allows you to run this workflow manually from the Actions tab
9+
workflow_dispatch:
10+
11+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
12+
permissions:
13+
contents: read
14+
pages: write
15+
id-token: write
16+
17+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
18+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
19+
concurrency:
20+
group: "pages"
21+
cancel-in-progress: false
22+
23+
jobs:
24+
# Single deploy job since we're just deploying
25+
deploy:
26+
environment:
27+
name: github-pages
28+
url: ${{ steps.deployment.outputs.page_url }}
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v4
33+
with:
34+
# Necessary to fetch tags and allow setuptools_scm
35+
# see: https://github.com/pypa/setuptools_scm/issues/480
36+
fetch-depth: 0
37+
38+
- name: Set up Python
39+
uses: actions/setup-python@v5
40+
with:
41+
python-version: 3.12
42+
cache: pip
43+
44+
- name: Build and install at
45+
run: python -m pip install ".[plot, doc]"
46+
47+
- name: Compile documentation
48+
run: make html
49+
working-directory: docs
50+
51+
- name: Upload artifact
52+
uses: actions/upload-pages-artifact@v3
53+
with:
54+
path: 'docs/_build/html'
55+
56+
- name: Deploy to GitHub Pages
57+
id: deployment
58+
uses: actions/deploy-pages@v4

.github/workflows/matlab-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,33 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-latest, macos-latest, windows-latest]
23+
os: [ubuntu-latest, macos-13, windows-latest]
2424

2525
steps:
2626

2727
- uses: actions/checkout@v4
2828

29-
- name: Set up python 3.9
29+
- name: Set up python
3030
uses: actions/setup-python@v5
3131
with:
32-
python-version: '3.9'
32+
python-version: '3.11'
3333
cache: pip
3434

3535
- name: Set up MATLAB
36-
uses: matlab-actions/setup-matlab@v1
36+
uses: matlab-actions/setup-matlab@v2
3737
with:
38-
release: R2022a
38+
release: R2024a
3939

4040
- name: Atmexall
41-
uses: matlab-actions/run-command@v1
41+
uses: matlab-actions/run-command@v2
4242
with:
4343
command: run('atmat/atpath');githubsetup();
4444

4545
- name: Build and install at
4646
run: python -m pip install .
4747

4848
- name: Run tests
49-
uses: matlab-actions/run-command@v1
49+
uses: matlab-actions/run-command@v2
5050
with:
5151
command: githubrun
5252
#

.github/workflows/python-tests.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ name: Build Python extension and run tests
66

77
on:
88
push:
9-
pull_request:
109

1110
jobs:
1211
build_and_run_tests:
@@ -16,11 +15,20 @@ jobs:
1615

1716
strategy:
1817
matrix:
19-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
20-
os: [macos-latest, ubuntu-latest, windows-latest]
21-
exclude:
22-
- os: windows-latest
18+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
19+
os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
20+
include:
21+
- os: macos-13
22+
python-version: '3.7'
23+
- os: macos-13
24+
python-version: '3.8'
25+
- os: ubuntu-22.04
2326
python-version: '3.7'
27+
- os: ubuntu-22.04
28+
python-version: '3.8'
29+
- os: windows-latest
30+
python-version: '3.8'
31+
2432

2533
steps:
2634

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.mex
66
*.mexa64
77
*.mexmaci64
8+
*.mexw64
89

910
# Compiled python
1011
*.pyc
12+
*.pyd
1113

1214
# pytest cache
1315
.cache

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 2
99
build:
1010
os: ubuntu-20.04
1111
tools:
12-
python: "3.9"
12+
python: "3.10"
1313
# You can also specify other tool versions:
1414
# nodejs: "16"
1515
# rust: "1.55"

Accelerator Toolbox.mltbx

1.59 MB
Binary file not shown.

0 commit comments

Comments
 (0)