Skip to content

Commit 4fb79fa

Browse files
rockyrocky
committed
Get ready for release 7.0.0
1 parent 6e56174 commit 4fb79fa

File tree

8 files changed

+171
-29
lines changed

8 files changed

+171
-29
lines changed

‎.github/workflows/ubuntu.yml‎

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

33
on:
44
push:
@@ -8,14 +8,14 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: ['3.9', '3.10']
14+
python-version: ['3.9', '3.10', '3.11']
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
@@ -24,11 +24,12 @@ jobs:
2424
python -m pip install pytest
2525
# Can comment out 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-
python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
28-
(cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
27+
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
28+
python -m pip install -e .
29+
# (cd src/mathics3 && bash ./admin-tools/make-op-tables.sh)
2930
- name: install pymathics graph
3031
run: |
3132
make develop
32-
- name: Test Mathics3
33+
- name: Test Mathics3 Module Graph
3334
run: |
3435
make -j3 check

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/.hypothesis
33
/.python-version
44
/ChangeLog
5+
/Mathics3_graph.egg-info
56
/build
67
/dist
78
/pymathics_graph.egg-info

‎ChangeLog-spell-corrected.diff‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
--- ChangeLog 2024-08-10 03:46:00.609284564 -0400
2+
+++ ChangeLog-spell-corrected 2024-08-10 03:45:36.963397654 -0400
3+
@@ -6,7 +6,7 @@
4+
5+
2024-08-08 R. Bernstein <[email protected]>
6+
7+
- * : Merge pull request #33 from Mathics3/dl_blanklines addiing blanklines between </dl> and the examples in docstrings
8+
+ * : Merge pull request #33 from Mathics3/dl_blanklines adding blanklines between </dl> and the examples in docstrings
9+
10+
2024-08-06 rocky <[email protected]>
11+
12+
@@ -48,7 +48,7 @@
13+
14+
* Makefile, pymathics/graph/base.py, pymathics/graph/tree.py,
15+
pymathics/graph/version.py, setup.py,
16+
- test/consistency-and-style/test_summary_text.py, test/helper.py:
17+
+ test/consistency-and-style/test_summary_text.py, test/helper.py:
18+
fixes
19+
20+
2023-07-24 rocky <[email protected]>
21+
@@ -65,7 +65,7 @@
22+
23+
2023-04-22 rocky <[email protected]>
24+
25+
- * pymathics/graph/properties.py, pymathics/graph/version.py:
26+
+ * pymathics/graph/properties.py, pymathics/graph/version.py:
27+
Revisions for NetWorkX >= 3.0.0
28+
29+
2023-03-02 rocky <[email protected]>
30+
@@ -129,7 +129,7 @@
31+
2023-02-17 rocky <[email protected]>
32+
33+
* pymathics/graph/__init__.py, pymathics/graph/base.py,
34+
- pymathics/graph/eval/parametric.py, pymathics/graph/parametric.py:
35+
+ pymathics/graph/eval/parametric.py, pymathics/graph/parametric.py:
36+
Make a pass over parametric graph section.. Some type-checking corrections were made and some bugs found from
37+
this fixed.
38+
39+
@@ -145,7 +145,7 @@
40+
2023-02-14 Juan Mauricio Matera <[email protected]>
41+
42+
* pymathics/graph/base.py, pymathics/graph/centralities.py,
43+
- pymathics/graph/operations.py, pymathics/graph/parametric.py:
44+
+ pymathics/graph/operations.py, pymathics/graph/parametric.py:
45+
another round of small fixes (#20) * another round of small fixes * remove extra line
46+
47+
2023-02-14 Juan Mauricio Matera <[email protected]>
48+
@@ -225,7 +225,7 @@
49+
2023-02-12 rocky <[email protected]>
50+
51+
* pymathics/graph/eval/tree.py, pymathics/graph/tree.py: Sort out
52+
- Tree module ... This might be temporay though based on WMA docs
53+
+ Tree module ... This might be temporary though based on WMA docs
54+
55+
2023-02-12 rocky <[email protected]>
56+
57+
@@ -331,7 +331,7 @@
58+
59+
* README.rst, pymathics/graph/__main__.py,
60+
pymathics/graph/algorithms.py, pymathics/graph/generators.py,
61+
- pymathics/graph/tree.py, pymathics/graph/version.py, setup.py:
62+
+ pymathics/graph/tree.py, pymathics/graph/version.py, setup.py:
63+
Changes for Mathics 6.0.0
64+
65+
2022-07-31 rocky <[email protected]>
66+
@@ -386,7 +386,7 @@
67+
68+
2022-07-19 rocky <[email protected]>
69+
70+
- * .pre-commit-config.yaml, pymathics/graph/__main__.py, setup.py:
71+
+ * .pre-commit-config.yaml, pymathics/graph/__main__.py, setup.py:
72+
WIP - conversion to mathics 5.0.0
73+
74+
2022-07-11 rocky <[email protected]>
75+
@@ -444,7 +444,7 @@
76+
77+
2021-02-15 rocky <[email protected]>
78+
79+
- * pymathics/graph/generators.py: KaryTree doc formating typo
80+
+ * pymathics/graph/generators.py: KaryTree doc formatting typo
81+
82+
2020-12-24 rocky <[email protected]>
83+
84+
@@ -453,7 +453,7 @@
85+
2020-12-24 rocky <[email protected]>
86+
87+
* NEWS.md, README.rst, admin-tools/.gitignore,
88+
- admin-tools/make-dist.sh, admin-tools/pyenv-versions, setup.py:
89+
+ admin-tools/make-dist.sh, admin-tools/pyenv-versions, setup.py:
90+
Administrivia.... Add NEWS.md and code to build distribution
91+
92+
2020-12-24 rocky <[email protected]>
93+
@@ -532,7 +532,7 @@
94+
95+
2020-12-05 rocky <[email protected]>
96+
97+
- * pymathics/graph/graph_generators.py, pymathics/graph/tree.py:
98+
+ * pymathics/graph/graph_generators.py, pymathics/graph/tree.py:
99+
graph layout should be Python string
100+
101+
2020-12-05 rocky <[email protected]>
102+
@@ -542,7 +542,7 @@
103+
104+
2020-12-04 rocky <[email protected]>
105+
106+
- * pymathics/graph/__main__.py, pymathics/graph/graph_generators.py:
107+
+ * pymathics/graph/__main__.py, pymathics/graph/graph_generators.py:
108+
VertexLabeling->VertexLabels Use helper function in CompleteGraph
109+
110+
2020-12-04 rocky <[email protected]>
111+
@@ -582,7 +582,7 @@
112+
113+
2020-11-29 rocky <[email protected]>
114+
115+
- * pymathics/graph/__main__.py, pymathics/graph/graph_generators.py:
116+
+ * pymathics/graph/__main__.py, pymathics/graph/graph_generators.py:
117+
DRY graph generators
118+
119+
2020-11-29 rocky <[email protected]>
120+
@@ -618,4 +618,3 @@
121+
2020-11-05 rocky <[email protected]>
122+
123+
* pymathics.graph: Mathic Graph functions
124+
-

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ rmChangeLog:
7474
#: Create a ChangeLog from git via git log and git2cl
7575
ChangeLog: rmChangeLog
7676
git log --pretty --numstat --summary | $(GIT2CL) >$@
77+
patch ChangeLog < ChangeLog-spell-corrected.diff
7778

7879

7980
#: Run pytest consistency and style checks

‎admin-tools/check-versions.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
function finish {
3+
cd $mathics_graph_owd
4+
}
5+
6+
# FIXME put some of the below in a common routine
7+
mathics_graph_owd=$(pwd)
8+
trap finish EXIT
9+
10+
cd $(dirname ${BASH_SOURCE[0]})
11+
if ! source ./pyenv-versions ; then
12+
exit $?
13+
fi
14+
15+
cd ..
16+
for version in $PYVERSIONS; do
17+
echo --- $version ---
18+
if ! pyenv local $version ; then
19+
exit $?
20+
fi
21+
make clean && pip install -e .
22+
if ! make check; then
23+
exit $?
24+
fi
25+
echo === $version ===
26+
done
27+
finish

‎admin-tools/make-dist.sh‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ PACKAGE=pymathics-graph
33

44
# FIXME put some of the below in a common routine
55
function finish {
6-
cd $owd
6+
cd $mathics_graph_owd
77
}
88

99
cd $(dirname ${BASH_SOURCE[0]})
10-
owd=$(pwd)
10+
mathics_graph_owd=$(pwd)
1111
trap finish EXIT
1212

1313
if ! source ./pyenv-versions ; then
@@ -19,21 +19,9 @@ cd ..
1919
source pymathics/graph/version.py
2020
echo $__version__
2121

22-
for pyversion in $PYVERSIONS; do
23-
if ! pyenv local $pyversion ; then
24-
exit $?
25-
fi
26-
# pip bdist_egg create too-general wheels. So
27-
# we narrow that by moving the generated wheel.
28-
29-
# Pick out first two number of version, e.g. 3.7.9 -> 37
30-
first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
31-
rm -fr build
32-
python setup.py develop
33-
python setup.py bdist_egg
34-
python setup.py bdist_wheel
35-
python setup.py bdist_wheel --universal
36-
mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py$first_two}-none-any.whl
37-
done
38-
22+
if ! pyenv local $pyversion ; then
23+
exit $?
24+
fi
25+
python setup.py bdist_wheel --universal
3926
python ./setup.py sdist
27+
finish

‎admin-tools/pyenv-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
55
echo "This script should be *sourced* rather than run directly through bash"
66
exit 1
77
fi
8-
export PYVERSIONS='3.6.15 3.7.16 3.8.16 3.9.16 3.10.10'
8+
export PYVERSIONS='3.8 3.9 3.10 3.11'

‎pymathics/graph/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# well as importing into Python. That's why there is no
66
# space around "=" below.
77
# fmt: off
8-
__version__="7.0.0dev0" # noqa
8+
__version__="7.0.0" # noqa

0 commit comments

Comments
 (0)