Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9, 3.11]
numpy-version: ["~=1.21.0", "~=1.26.0"]
exclude:
- python-version: 3.11
numpy-version: "~=1.21.0"
python-version: [3.11, 3.12]
numpy-version: ["~=1.25", "~=2.3"]
steps:
- uses: actions/checkout@v5
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion pyxdsm/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.3.1"
__version__ = "2.3.2"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"pyxdsm",
],
package_data={"pyxdsm": ["*.tex"]},
install_requires=["numpy>=1.21"],
python_requires=">=3",
python_requires=">=3.11",
install_requires=["numpy>=1.25"],
classifiers=[
"Operating System :: OS Independent",
"Programming Language :: Python",
Expand Down
5 changes: 2 additions & 3 deletions tests/test_xdsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import tempfile
import subprocess
from pyxdsm.XDSM import XDSM, OPT, FUNC, SOLVER, LEFT, RIGHT
from numpy.distutils.exec_command import find_executable

basedir = os.path.dirname(os.path.abspath(__file__))

Expand Down Expand Up @@ -44,7 +43,7 @@ def test_examples(self):
self.assertTrue(os.path.isfile(f + ".tikz"))
self.assertTrue(os.path.isfile(f + ".tex"))
# look for the pdflatex executable
pdflatex = find_executable("pdflatex") is not None
pdflatex = shutil.which("pdflatex") is not None
# if no pdflatex, then do not assert that the pdf was compiled
self.assertTrue(not pdflatex or os.path.isfile(f + ".pdf"))
subprocess.run(["python", "mat_eqn.py"], check=True)
Expand All @@ -60,7 +59,7 @@ def test_connect(self):
try:
x.connect("D1", "D2", r"\mathcal{R}(y_1)", "foobar")
except ValueError as err:
self.assertEquals(str(err), "label_width argument must be an integer")
self.assertEqual(str(err), "label_width argument must be an integer")
else:
self.fail("Expected ValueError")

Expand Down
Loading