diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6cd15d9..2cb23db 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 }} diff --git a/pyxdsm/__init__.py b/pyxdsm/__init__.py index 3a5935a..ef6497d 100644 --- a/pyxdsm/__init__.py +++ b/pyxdsm/__init__.py @@ -1 +1 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" diff --git a/setup.py b/setup.py index ea8d36a..4b97280 100644 --- a/setup.py +++ b/setup.py @@ -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", diff --git a/tests/test_xdsm.py b/tests/test_xdsm.py index 9a2def3..6e89b70 100644 --- a/tests/test_xdsm.py +++ b/tests/test_xdsm.py @@ -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__)) @@ -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) @@ -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")