Skip to content

Commit 461f2b1

Browse files
authored
Roll in 3.14 and rollout 3.10 (#39)
* Roll in 3.14 and rollout 3.10
1 parent 3bc5854 commit 461f2b1

File tree

9 files changed

+41
-40
lines changed

9 files changed

+41
-40
lines changed

.github/workflows/consistency-checks.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,28 @@ jobs:
1313
matrix:
1414
python-version: ['3.13']
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip
24-
python -m pip install pytest
24+
python -m pip install pytest setuptools
2525
python -m pip install Mathics3-Module-Base
26-
# Can comment out when next Mathics3 core and Mathics-scanner are released
27-
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
26+
# Until the next Mathics3-scanner release
27+
git clone https://github.com/Mathics3/Mathics3-scanner
28+
(cd Mathics3-scanner && pip3 install -e .[full] --no-build-isolation && bash -x ./admin-tools/make-JSON-tables.sh)
2829
# Until the next mathics-core release
2930
git clone https://github.com/Mathics3/mathics-core
30-
(cd mathics-core && python -m pip install -e .[full])
31+
(cd mathics-core && python -m pip install --no-build-isolation -e .[full])
3132
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
3233
3334
- name: Install Mathics3 Module nltk
3435
run: |
3536
python -m pip install --no-build-isolation setuptools Mathics3[full] nltk PatternLite enchant
3637
make develop
37-
- name: Test Mathics Consistency and Style
38+
- name: Test Mathics3 Consistency and Style
3839
run: |
3940
make check-consistency-and-style

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,28 @@
33
# Othewrwise, Black is run and its changes are committed back to the incoming pull request.
44
# https://github.com/cclauss/autoblack
55

6-
name: isort and black
6+
name: isort and black check
77
on: [pull_request]
88
jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- name: Set up Python 3.13
14-
uses: actions/setup-python@v5
12+
- uses: actions/checkout@v6
13+
- name: Set up Python 3.14
14+
uses: actions/setup-python@v6
1515
with:
16-
python-version: 3.13
16+
python-version: 3.14
1717
- name: Install click, black and isort
1818
run: pip install 'click==8.2.1' 'black==25.11.0' 'isort==5.13.2'
19-
- name: Run isort --check .
20-
run: isort --check .
2119
- name: Run black --check --diff .
2220
run: black --check --diff .
23-
- name: If needed, commit black changes to the pull request
24-
if: failure()
25-
run: |
26-
black .
27-
git config --global user.name 'autoblack'
28-
git config --global user.email 'rocky@users.noreply.github.com'
29-
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
30-
git checkout $GITHUB_HEAD_REF
31-
git commit -am "fixup: Format Python code with Black"
32-
git push
21+
# - name: If needed, commit black changes to the pull request
22+
# if: failure()
23+
# run: |
24+
# black .
25+
# git config --global user.name 'autoblack'
26+
# git config --global user.email 'rocky@users.noreply.github.com'
27+
# git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
28+
# git checkout $GITHUB_HEAD_REF
29+
# git commit -am "fixup: Format Python code with Black"
30+
# git push

.github/workflows/ubuntu.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,32 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: ['3.12', '3.13']
14+
python-version: ['3.12', '3.13', '3.14']
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip
24-
python -m pip install pytest
24+
python -m pip install pytest setuptools
2525
# Go over and comment out stuff when next Mathics core and Mathics-scanner are released
26+
# Go over and comment out stuff when next Mathics core and Mathics3-scanner are released
27+
git clone https://github.com/Mathics3/Mathics3-scanner
28+
(cd Mathics3-scanner && pip3 install -e .[full] --no-build-isolation && bash -x ./admin-tools/make-JSON-tables.sh)
2629
# python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full]
2730
# Until the next mathics-core release
2831
git clone https://github.com/Mathics3/mathics-core
29-
(cd mathics-core && python -m pip install -e .[full])
30-
(cd mathics-core && bash ./admin-tools/make-JSON-tables.sh)
32+
(cd mathics-core && pip3 install --no-biuild-isolation -e .[full])
33+
(cd mathics-core && bash -x ./admin-tools/make-JSON-tables.sh)
3134
3235
- name: Install Mathics3 Module nltk
3336
run: |
3437
python -m pip install --no-build-isolation setuptools Mathics3[full] nltk PatternLite enchant
3538
make develop
39+
python -m pip install -e .[full] --no-build-isolation
40+
# make develop
3641
- name: Test Mathics3 Module nltk
37-
run: |
3842
make -j3 check

pymathics/natlang/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
WordDefinition,
4949
WordList,
5050
)
51+
from pymathics.natlang.linguistic_data.translation import LanguageIdentify
5152
from pymathics.natlang.manipulate import Pluralize
5253
from pymathics.natlang.normalization import (
5354
DeleteStopwords,
@@ -65,8 +66,6 @@
6566
WordSimilarity,
6667
WordStem,
6768
)
68-
69-
from pymathics.natlang.linguistic_data.translation import LanguageIdentify
7069
from pymathics.natlang.version import __version__
7170

7271
pymathics_version_data = {

pymathics/natlang/nltk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"""
44
nltk backend
55
"""
6+
67
import re
78
from itertools import chain
89

910
import nltk
10-
from pattern.text.en import lexeme, pluralize
11-
1211
from mathics.builtin.codetables import iso639_3
1312
from mathics.core.atoms import String
1413
from mathics.core.builtin import Builtin, MessageException
1514
from mathics.core.evaluation import Evaluation
1615
from mathics.core.symbols import strip_context
16+
from pattern.text.en import lexeme, pluralize
1717

1818
# Don't consider this for user documentation
1919
no_doc = True

pymathics/natlang/normalization.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
1010
This module uses spacy as a backend.
1111
"""
12+
1213
import itertools
1314
from itertools import islice
1415
from typing import Optional

pymathics/natlang/spacy.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from typing import Optional
1313

1414
import spacy
15-
1615
from mathics.core.atoms import String
1716
from mathics.core.builtin import Builtin
1817
from mathics.core.evaluation import Evaluation

pymathics/natlang/textual_analysis.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import enchant
1414
import nltk
1515
import spacy
16-
1716
from mathics.core.atoms import Integer, Real, String
1817
from mathics.core.builtin import Builtin
1918
from mathics.core.evaluation import Evaluation

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build-backend = "setuptools.build_meta"
2121
name = "Mathics3-Module-nltk"
2222
description = "Mathics3 Natural Language Toolkit module"
2323
dependencies = [
24-
"Mathics3>=9.0.0",
24+
"Mathics3>9.0.0",
2525
"Mathics3-Module-Base>=9.0.0",
2626
"click>=8.0",
2727
"joblib>=1.0.1",
@@ -35,7 +35,7 @@ dependencies = [
3535
"spacy>=3.4",
3636
"wasabi<1.1.0,>=0.8.2",
3737
]
38-
requires-python = ">=3.10"
38+
requires-python = ">=3.11"
3939
readme = "README.rst"
4040
license = "GPL-3.0-or-later"
4141
keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"]
@@ -46,10 +46,10 @@ classifiers = [
4646
"Intended Audience :: Developers",
4747
"Intended Audience :: Science/Research",
4848
"Programming Language :: Python",
49-
"Programming Language :: Python :: 3.10",
5049
"Programming Language :: Python :: 3.11",
5150
"Programming Language :: Python :: 3.12",
5251
"Programming Language :: Python :: 3.13",
52+
"Programming Language :: Python :: 3.14",
5353
"Programming Language :: Python :: Implementation :: CPython",
5454
"Programming Language :: Python :: Implementation :: PyPy",
5555
"Topic :: Scientific/Engineering",

0 commit comments

Comments
 (0)