Skip to content

Commit cb2118a

Browse files
committed
Yet another try
1 parent fff09d5 commit cb2118a

File tree

5 files changed

+43
-25
lines changed

5 files changed

+43
-25
lines changed

.github/workflows/osx.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
push:
55
branches: [ master ]
66
pull_request:
7-
branches: [ master ]
7+
branches: '**'
88

99
jobs:
1010
build:
1111
runs-on: macos-latest
1212
strategy:
1313
matrix:
1414
os: [macOS]
15-
python-version: [3.13]
15+
python-version: ['3.11', '3.12', '3.13']
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Set up Python ${{ matrix.python-version }}
@@ -23,12 +23,16 @@ jobs:
2323
run: |
2424
brew install llvm
2525
python -m pip install --upgrade pip
26-
pip install pytest
27-
# Can remove after next Mathics-core release
28-
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
29-
- name: Install pymathics.hello
26+
python -m pip install pytest
27+
# Go over and comment out stuff when next Mathics core and Mathics-scanner are released
28+
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
29+
git clone https://github.com/Mathics3/mathics-core
30+
(cd mathics-core && pip3 install -e .[full])
31+
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
32+
python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
33+
- name: Install Mathic3 Hello Module
3034
run: |
31-
pip install -e .
32-
- name: Test Mathics
35+
python -m pip install -e .
36+
- name: Test Mathics3 Hello Module
3337
run: |
3438
make check

.github/workflows/ubuntu.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: [3.12]
14+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Set up Python ${{ matrix.python-version }}
@@ -28,10 +28,9 @@ jobs:
2828
(cd mathics-core && pip3 install -e .[full])
2929
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
3030
python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
31-
python -m pip install -e .
32-
- name: install Mathics3 module Hello
31+
- name: install Mathic3 Hello Module
3332
run: |
34-
pip install -e .
35-
- name: Test Mathics
33+
python -m pip install -e .
34+
- name: Test Mathics3 Hello Module
3635
run: |
3736
make check

.github/workflows/windows.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
push:
55
branches: [ master ]
66
pull_request:
7-
branches: [ master ]
7+
branches: '**'
88

99
jobs:
1010
build:
1111
runs-on: windows-latest
1212
strategy:
1313
matrix:
1414
os: [windows]
15-
python-version: [ 3.13]
15+
python-version: ['3.9', '3.11', '3.12']
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Set up Python ${{ matrix.python-version }}
@@ -22,13 +22,17 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
python -m pip install --upgrade pip
25-
python -m pip install wheel
26-
pip install pytest
27-
# Can remove after next Mathics-core release
28-
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
29-
- name: Install pymathics.hello
25+
python -m pip install pytest
26+
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner
27+
git clone --depth 1 https://github.com/Mathics3/mathics-core mathics-core
28+
cd mathics-core
29+
python -m pip install -e .
30+
bash admin-tools/make-JSON-tables.sh
31+
cd ..
32+
python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
33+
- name: Install Mathic3 Hello Module
3034
run: |
31-
pip install -e .
35+
python -m pip install -e .
3236
- name: Test Mathics
3337
run: |
3438
make check

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ repos:
66
hooks:
77
- id: check-merge-conflict
88
- id: debug-statements
9-
stages: [commit]
9+
stages: [pre-commit]
1010
- id: end-of-file-fixer
11-
stages: [commit]
11+
stages: [pre-commit]
1212
# - repo: https://github.com/pycqa/isort
1313
# rev: 5.10.1
1414
# hooks:
@@ -20,9 +20,9 @@ repos:
2020
- id: black
2121
language_version: python3
2222
exclude: 'pymathics/hello/version.py'
23-
stages: [commit]
23+
stages: [pre-commit]
2424
- repo: https://github.com/pycqa/flake8
2525
rev: 3.9.2
2626
hooks:
2727
- id: flake8
28-
stages: [commit]
28+
stages: [pre-commit]

pyproject.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
[build-system]
2+
requires = [
3+
"setuptools>=70.0.0", # CVE-2024-38335 recommends this
4+
"mpmath>=1.2.0",
5+
"numpy<1.27",
6+
"matplotlib",
7+
"scipy>=1.10.0",
8+
"sympy>=1.11,<1.13",
9+
]
10+
build-backend = "setuptools.build_meta"
11+
112
[project]
213
name = "Mathics3-hello"
314
description = 'Mathics3 Hello, World! module'

0 commit comments

Comments
 (0)