Skip to content

Commit 54a96c3

Browse files
rockymmatera
andauthored
Get ready for release 9.0.0 (#34)
* Get ready for release 9.0.0 * Update consistency-checks.yml * Update consistency-checks.yml * Update consistency-checks.yml * Update consistency-checks.yml * Update ubuntu.yml * force install spicy.yml * Update ubuntu.yml add langid * Update ubuntu.yml * Update pyproject.toml * Update pyproject.toml * Update pyproject.toml * Update pyproject.toml * Update ubuntu.yml * Update consistency-checks.yml * Update consistency-checks.yml * Update pyproject.toml * Update pyproject.toml * Update ubuntu.yml * Update pyproject.toml * Update pyproject.toml --------- Co-authored-by: Juan Mauricio Matera <[email protected]>
1 parent f53dd72 commit 54a96c3

File tree

6 files changed

+34
-42
lines changed

6 files changed

+34
-42
lines changed

.github/workflows/consistency-checks.yml

Lines changed: 9 additions & 8 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.13']
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Set up Python ${{ matrix.python-version }}
@@ -20,16 +20,17 @@ jobs:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
2222
run: |
23-
# python -m pip install --upgrade pip
23+
python -m pip install --upgrade pip
24+
python -m pip install --upgrade setuptools>=70.0.0
2425
python -m pip install pytest
2526
# Can comment out when next Mathics3 core and Mathics-scanner are released
26-
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-JSON-tables.sh)
29-
# python -m pip install Mathics3[full]
30-
python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
31-
- name: Install Pymathics.natlang
27+
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
28+
# python -m pip install -e git+https://github.com/Mathics3/mathics-core#egg=Mathics3[full]
29+
# (cd src/mathics3 && 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 Mathics3 natlang Module
3232
run: |
33+
python -m pip install --no-build-isolation setuptools Mathics3[full] nltk PatternLite enchant
3334
make develop
3435
- name: Test Mathics Consistency and Style
3536
run: |

.github/workflows/isort-and-black-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- name: Set up Python 3.9
13+
- name: Set up Python 3.13
1414
uses: actions/setup-python@v5
1515
with:
16-
python-version: 3.9
16+
python-version: 3.13
1717
- name: Install click
1818
run: pip install 'click==8.0.4'
1919
- name: Install Black

.github/workflows/ubuntu.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
# 3.9 works but it takes a long time to gather dependencies
15-
python-version: ['3.10', '3.11', '3.12', '3.13']
14+
python-version: ['3.12', '3.13']
1615
steps:
1716
- uses: actions/checkout@v4
1817
- name: Set up Python ${{ matrix.python-version }}
@@ -22,16 +21,18 @@ jobs:
2221
- name: Install dependencies
2322
run: |
2423
python -m pip install --upgrade pip
24+
# Required for some kind of conflict with stopit...
25+
python -m pip install --upgrade setuptools>=70.0.0
2526
python -m pip install pytest
2627
# Go over and comment out stuff when next Mathics core and Mathics-scanner are released
27-
python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
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-
python -m pip install -e git+https://github.com/Mathics3/Mathics3-Module-Base#egg=Mathics3-Module-Base
32-
python -m pip install -e .
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
3333
- name: Install Mathics3 natlang Module
3434
run: |
35+
python -m pip install --no-build-isolation setuptools Mathics3[full] nltk PatternLite enchant
3536
make develop
3637
- name: Test natlang Mathics3 Module
3738
run: |

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ wordlist:
3333
$(PYTHON) -m nltk.downloader wordnet2022 omw-1.4
3434
$(PYTHON) -m spacy download $(SPACY_DOWNLOAD)
3535

36-
#: build everything needed to install
37-
build: pypi-setup
38-
$(PYTHON) ./setup.py build
39-
4036
#: Check Python version, and install PyPI dependencies
4137
pypi-setup:
42-
$(PIP) install -e .
38+
$(PIP) install --no-build-isolation -e .
4339

4440
#: Set up to run from the source tree
4541
develop: pypi-setup

pymathics/natlang/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__="8.0.2.dev0" # noqa
8+
__version__="9.0.0" # noqa

pyproject.toml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
11
[build-system]
22
requires = [
3-
"setuptools>=70.0.0",
4-
"sympy>=1.11,<1.13",
5-
"PatternLite",
6-
"langid", # replace with a supported newer package, e.g. via spacy
7-
"matplotlib",
8-
"mpmath>=1.2.0",
9-
"numpy",
10-
"pycountry>=3.2.0",
11-
"pyenchant>=3.2.0",
12-
"scipy>=1.10.0",
13-
"spacy>=3.4",
14-
"wasabi<1.1.0,>=0.8.2",
3+
"setuptools>=70.0.0",
4+
"wheel",
155
]
166
build-backend = "setuptools.build_meta"
177

188
[project]
199
name = "Mathics3-natlang"
2010
description = "Mathics3 Natural Language Toolkit module"
2111
dependencies = [
22-
"Mathics3>=8.0.1",
23-
"Mathics3-Module-Base",
12+
"setuptools>=70.0.0",
13+
"Mathics3>=9.0.0",
14+
"Mathics3-Module-Base>=9.0.0",
2415
"click>=8.0",
2516
"joblib>=1.0.1",
26-
"langid", # replace with a supported newer package, e.g. via spacy
17+
# replace with a supported newer package, e.g. via spacy
18+
"langid",
2719
"llvmlite>=0.36",
2820
"nltk>=3.8.0",
21+
"mpmath>=1.2.0",
2922
"PatternLite",
3023
"pyenchant>=3.2.0",
3124
"pycountry>=3.2.0",
@@ -34,15 +27,14 @@ dependencies = [
3427
]
3528
requires-python = ">=3.10"
3629
readme = "README.rst"
37-
license = {text = "GPL"}
30+
license = "GPL-3.0-or-later"
3831
keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"]
3932
maintainers = [
4033
{name = "Mathics Group", email = "[email protected]"},
4134
]
4235
classifiers = [
4336
"Intended Audience :: Developers",
4437
"Intended Audience :: Science/Research",
45-
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
4638
"Programming Language :: Python",
4739
"Programming Language :: Python :: 3.10",
4840
"Programming Language :: Python :: 3.11",
@@ -71,4 +63,6 @@ packages = [
7163
]
7264

7365
[tool.setuptools.dynamic]
74-
version = {attr = "pymathics.natlang.__version__"}
66+
# We cannot load the version directly from pymathics.natlang.__init__,
67+
# because it would try to import modules which are not already installed.
68+
version = {attr = "pymathics.natlang.version.__version__"}

0 commit comments

Comments
 (0)