Skip to content

Commit f5c81a7

Browse files
committed
Use mathics-core from git until release
1 parent 7f14a0b commit f5c81a7

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

.github/workflows/consistency-checks.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pymathics-Graph (Consistency Checks)
1+
name: Mathics3-Module-networkx (Consistency Checks)
22

33
on:
44
push:
@@ -22,14 +22,15 @@ jobs:
2222
run: |
2323
python -m pip install --upgrade pip
2424
python -m pip install pytest
25+
# Until the next mathics-core release
2526
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
26-
# git clone https://github.com/Mathics3/mathics-core
27-
# (cd mathics-core && make)
28-
# (cd mathics-core && python -m pip install -e .[full])
29-
# python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
30-
- name: Install Pymathics.graph with minimum dependencies
27+
git clone https://github.com/Mathics3/mathics-core
28+
(cd mathics-core && python -m pip install -e .[full])
29+
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
30+
31+
- name: Install Mathics3-Module-Networkx.graph with minimum dependencies
3132
run: |
32-
make develop
33+
python -m pip install -e . --no-build-isolation
3334
- name: Test Mathics Consistency and Style
3435
run: |
3536
make check-consistency-and-style

.github/workflows/ubuntu.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Mathic3 Graph Module (ubuntu)
1+
name: Mathic3 Module networkx (ubuntu)
22

33
on:
44
push:
@@ -24,14 +24,15 @@ jobs:
2424
python -m pip install pytest
2525
# Go over and comment out stuff when next Mathics core and Mathics-scanner are released
2626
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
27-
# git clone https://github.com/Mathics3/mathics-core
28-
# (cd mathics-core && pip3 install -e .[full])
29-
# (cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
30-
# python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
31-
- name: install pymathics graph
27+
# Until the next mathics-core release
28+
git clone https://github.com/Mathics3/mathics-core
29+
(cd mathics-core && pip3 install -e .[full])
30+
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
31+
32+
- name: install Mathics3 Module networkx
3233
run: |
33-
python -m pip install -e .[full]
34+
python -m pip install -e .[full] --no-build-isolation
3435
# make develop
35-
- name: Test Mathics3 Module Graph
36+
- name: Test Mathics3 Module networkx
3637
run: |
3738
make -j3 check

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dist:
3838

3939
#: Install pymathics.graph
4040
install: pypi-setup
41-
$(PYTHON) setup.py install
41+
$(PYTHON) -m pip install -e . --no-build-isolation
4242

4343
# Run tests
4444
test check: pytest doctest

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
requires = [
33
"setuptools", # CVE-2024-38335 recommends this
44
"Mathics3>9.0.0",
5+
"Mathics3-Module-Base",
56
"networkx>=3.0.0",
67
"matplotlib",
78
"Mathics3-Module-Base",
89
]
910
build-backend = "setuptools.build_meta"
1011

1112
[project]
12-
name = "Mathics3-graph"
13+
name = "Mathics3-Module-networkx"
1314
description = "Mathics3 Graph Module using NetworkX"
1415
dependencies = [
1516
"Mathics3>=9.0.0",
@@ -45,8 +46,8 @@ classifiers = [
4546
dynamic = ["version"]
4647

4748
[project.urls]
48-
Homepage = "https://github.com/Mathics3/pymathics-graph"
49-
Downloads = "https://github.com/Mathics3/pymathics-graph/releases"
49+
Homepage = "https://github.com/Mathics3/Mathics3-Module-networkx-graph"
50+
Downloads = "https://github.com/Mathics3/Mathics3-Module-networkx/releases"
5051

5152
[project.optional-dependencies]
5253
dev = [

0 commit comments

Comments
 (0)