Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for Python 3.12, NumPy 2.0, and SciPy 1.14 #1050

Merged
merged 26 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
72b3885
Monkeypatch versioneer.py
guyer Jun 18, 2024
2c7136d
Replace obj2sctype
guyer Jun 18, 2024
2eed418
Replace `.getsctype()` with `.dtype`
guyer Jun 18, 2024
62bd0ff
Replace `NUMERIX.issubclass_()` with `issubclass()`
guyer Jun 18, 2024
4e7923a
Replace `itemset()` with indexing
guyer Jun 18, 2024
9921bf8
Fix obsolete name for infinity
guyer Jun 18, 2024
55f78f3
Fix comparison operator representation
guyer Jun 18, 2024
0b14ced
Use `ins.argrepr` for representation of operator variables
guyer Feb 22, 2024
08124c2
Remove future.standard_library
guyer Feb 22, 2024
d91ccdc
Update locks
guyer Jun 20, 2024
29047ee
Add `return_scalar` to `__array_wrap__` for NumPy 2.0
guyer Jun 20, 2024
69a4e24
Add `copy=` argument to `__array__` for NumPy 2.0
guyer Jun 20, 2024
908825d
Address `copy=None` for NumPy < 2.0
guyer Jun 20, 2024
6e6c68e
Defer return_scalar for OperatorVariables
guyer Jun 20, 2024
729e2c5
Fix polarity of floating CellVariable check
guyer Jun 20, 2024
130983f
Replace deprecated `numpy.in1d` with `numpy.isin`
guyer Jun 20, 2024
afd1697
Replace deprecated `tol=` with `rtol=` to SciPy Krylov solvers
guyer Jun 20, 2024
43c143a
Replace deprecated `atol='legacy'` for SciPy Krylov solves
guyer Jun 20, 2024
3a1e316
Remove internal implementation details of numpy.array2string
guyer Jun 20, 2024
0ce2a46
Override legacy formatting set for tests
guyer Jun 21, 2024
f7c0ada
Lock out petsc 3.21
guyer Jun 21, 2024
b9f75b8
Make directory that already exists
guyer Jun 21, 2024
4e30696
Fix case of tarball
guyer Jun 21, 2024
1e411d4
Fix type of int Variable for Windows
guyer Jun 21, 2024
21bc31e
build(nix): update to python 3.12 and nixos 24.05
wd15 Jun 25, 2024
e25c210
ci(actions): generate egg_info
wd15 Jun 25, 2024
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
12 changes: 6 additions & 6 deletions .azure/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ stages:
- bash: |
conda create --quiet --name wheelEnvironment --channel conda-forge python=3.10
source activate wheelEnvironment
mkdir tmp
mkdir -p tmp
cd tmp
python -m pip install ../dist/*.whl
FIPY_SOLVERS=scipy python -c "import fipy; fipy.test()"
Expand All @@ -232,11 +232,11 @@ stages:
- bash: |
source activate myEnvironment
FIPY_VERSION=`python setup.py --version`
mkdir tmp
mkdir -p tmp
cd tmp
cp ../dist/FiPy-${FIPY_VERSION}.tar.gz .
tar zxvf FiPy-${FIPY_VERSION}.tar.gz
cd FiPy-${FIPY_VERSION}
cp ../dist/fipy-${FIPY_VERSION}.tar.gz .
tar zxvf fipy-${FIPY_VERSION}.tar.gz
cd fipy-${FIPY_VERSION}
python setup.py install
cd ..
python -c "import fipy; fipy.test()"
Expand All @@ -248,7 +248,7 @@ stages:
- bash: |
source activate myEnvironment
FIPY_VERSION=`python setup.py --version`
mkdir tmp
mkdir -p tmp
cd tmp
cp ../dist/FiPy-${FIPY_VERSION}.zip .
unzip FiPy-${FIPY_VERSION}.zip
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
with:
path: /run/user/${{ env.UID }}/http_cache.sqlite
key: ${{ runner.os }}-http_cache.sqlite
- run: nix develop --command bash -c "python setup.py egg_info"
- run: nix develop --command bash -c "python setup.py test"
- run: nix develop --command bash -c "py.test --nbval --nbval-sanitize-with examples/sanitize.cfg examples/index.ipynb"
- uses: actions/cache/save@v3
Expand Down
10 changes: 5 additions & 5 deletions docs/source/sphinxext/redirecting_html.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from __future__ import unicode_literals
from future import standard_library
standard_library.install_aliases()
from docutils import nodes
import urllib.parse

try:
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
from sphinx.builders.html import StandaloneHTMLBuilder

class RedirectingHTMLBuilder(StandaloneHTMLBuilder):
Expand All @@ -17,7 +17,7 @@ def write_doc(self, docname, doctree):
for node in doctree.traverse(nodes.reference):
try:
uri = node['refuri']
uri = urllib.parse.urlparse(uri)
uri = urlparse(uri)
if uri.scheme in ["http", "https"]:
if not uri.netloc.endswith("nist.gov"):
node['refuri'] = "/cgi-bin/redirect.py?url=" + uri.geturl()
Expand Down
322 changes: 175 additions & 147 deletions environments/locks/conda-petsc-linux-64.lock

Large diffs are not rendered by default.

Loading
Loading