From a233f0b46618c9b7804080dcc413c994ed59a723 Mon Sep 17 00:00:00 2001 From: himoto Date: Tue, 19 Nov 2024 18:47:28 +0000 Subject: [PATCH 1/5] Force the use of LTS version --- diffeqpy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffeqpy/__init__.py b/diffeqpy/__init__.py index 17f67f3..3c4ca23 100644 --- a/diffeqpy/__init__.py +++ b/diffeqpy/__init__.py @@ -61,7 +61,7 @@ def install(*, confirm=False): julia = _find_julia() if not julia: print("No Julia version found. Installing Julia.") - install_julia(confirm=confirm) + install_julia(version="1.10", confirm=confirm) julia = _find_julia() if not julia: raise RuntimeError( From 9f22e2825b564928b5be1b7a6673d185182d2bfd Mon Sep 17 00:00:00 2001 From: himoto Date: Tue, 19 Nov 2024 18:47:42 +0000 Subject: [PATCH 2/5] Set confirm to True --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e925450..2cac1a4 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ deps = pytest pytest-cov commands = - python -c 'import diffeqpy; diffeqpy.install()' + python -c 'import diffeqpy; diffeqpy.install(confirm=True)' py.test \ --pyargs diffeqpy \ {posargs} From 3f560831251da5fe8f2613c439997b9f10de4cf1 Mon Sep 17 00:00:00 2001 From: himoto Date: Tue, 19 Nov 2024 18:48:17 +0000 Subject: [PATCH 3/5] Update CI.yml --- .github/workflows/CI.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 81e995f..7877c6b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,19 +15,18 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + - macos-14 # Disabling Windows tests as it's known to not work: # https://github.com/SciML/diffeqpy/pull/86#issuecomment-1011675735 # - windows-latest - architecture: [x64] - python-version: ['3.10'] + python-version: ['3.8', '3.12'] fail-fast: false name: Test ${{ matrix.os }} ${{ matrix.architecture }} Python ${{ matrix.python-version }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.architecture }} From d4b8d6ccb4302441b0c4f019ee791649e24dff80 Mon Sep 17 00:00:00 2001 From: himoto Date: Tue, 19 Nov 2024 18:49:28 +0000 Subject: [PATCH 4/5] Update supported Python versions --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 47263dc..64d9352 100644 --- a/setup.py +++ b/setup.py @@ -12,9 +12,11 @@ def readme(): classifiers=[ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Scientific/Engineering :: Mathematics', 'Topic :: Scientific/Engineering :: Physics' ], From 436699dc677a60bcd0aac28c981214e4ae974067 Mon Sep 17 00:00:00 2001 From: himoto Date: Tue, 19 Nov 2024 18:55:49 +0000 Subject: [PATCH 5/5] Force the use of LTS version in yml --- .github/workflows/CI.yml | 4 ++++ diffeqpy/__init__.py | 2 +- tox.ini | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7877c6b..0389631 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -34,6 +34,10 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install --upgrade tox + - name: Install Julia using jill + run: | + python -m pip install --upgrade jill + python -c "from jill.install import install_julia; install_julia(version='1.10', confirm=True)" - name: Run test run: python -m tox -- --cov=diffeqpy -s env: diff --git a/diffeqpy/__init__.py b/diffeqpy/__init__.py index 3c4ca23..17f67f3 100644 --- a/diffeqpy/__init__.py +++ b/diffeqpy/__init__.py @@ -61,7 +61,7 @@ def install(*, confirm=False): julia = _find_julia() if not julia: print("No Julia version found. Installing Julia.") - install_julia(version="1.10", confirm=confirm) + install_julia(confirm=confirm) julia = _find_julia() if not julia: raise RuntimeError( diff --git a/tox.ini b/tox.ini index 2cac1a4..e925450 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ deps = pytest pytest-cov commands = - python -c 'import diffeqpy; diffeqpy.install(confirm=True)' + python -c 'import diffeqpy; diffeqpy.install()' py.test \ --pyargs diffeqpy \ {posargs}