Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
8d2064d
bump python version
briochh Oct 8, 2025
d51fe59
also bump rtd
briochh Oct 8, 2025
603cfe1
Update ci.yml
briochh Oct 8, 2025
75e7b15
Update ci.yml
briochh Oct 8, 2025
a9c59d8
Update ci.yml
briochh Oct 8, 2025
2aa5657
more ci
briochh Oct 8, 2025
29d5586
more ci
briochh Oct 8, 2025
4e49afa
pytest-plugins in root
briochh Oct 8, 2025
1ef6cd5
mac test-path
briochh Oct 8, 2025
1cfb0d3
Moving to min python version == 3.10
briochh Oct 31, 2025
1d96b01
first attempt migrating to uv
briochh Oct 31, 2025
f1967fb
need lockfile
briochh Oct 31, 2025
5e3487d
add optional packages for CI
briochh Oct 31, 2025
be5d10a
adding scikit-learn
briochh Oct 31, 2025
036b69a
Merge remote-tracking branch 'origin/develop' into feat_uv
briochh Nov 1, 2025
a0abbc6
tinkering with pytest defs in toml
briochh Nov 1, 2025
c725ff6
nb test coverage
briochh Nov 1, 2025
771bfb5
more nb test coverage
briochh Nov 1, 2025
a02343f
more nb test coverage
briochh Nov 1, 2025
9280e49
more nb testing -- adding ffmpeg
briochh Nov 2, 2025
b3c64bf
more nb testing -- adding ffmpeg
briochh Nov 2, 2025
c1acf09
more nb testing -- adding ffmpeg
briochh Nov 2, 2025
651d6ba
Update conftest.py
briochh Nov 2, 2025
30c5623
Update conftest.py
briochh Nov 2, 2025
0fa744c
Update ci.yml
briochh Nov 2, 2025
3d06f97
more notebook nbval tinkering
briochh Nov 3, 2025
caa42da
update uv.loc
briochh Nov 3, 2025
2782785
testing coverage without notebook
briochh Nov 3, 2025
bbda1dd
notebooks back in -- seems to work for coverage
briochh Nov 3, 2025
674a4a0
adding in pst_from_tests
briochh Nov 3, 2025
52f73a7
Rudimentary support for exe paths starting with '/' in start workers
briochh Nov 3, 2025
72bb9f6
bringing in more tests
briochh Nov 3, 2025
9d26386
more flex around conftest exe resolve
briochh Nov 3, 2025
b92c762
using github token to get around rate limit in get-pestpp (I think)
briochh Nov 3, 2025
f37202a
fixing exe path collect
briochh Nov 3, 2025
a6f6127
more tokening ci tests
briochh Nov 3, 2025
da8d1a8
testing agg setting and exe pickup in emulator testing
briochh Nov 3, 2025
2b9a1ca
more messing with exe pickup
briochh Nov 3, 2025
70cdefa
using pytest tmp_path in emulator tests to stop bad things happening
briochh Nov 3, 2025
2b6e228
dependancy for dsivc test
briochh Nov 3, 2025
de49fd5
Update emulator_tests.py
briochh Nov 3, 2025
64a3407
Update emulator_tests.py
briochh Nov 3, 2025
5a628b4
Update emulator_tests.py
briochh Nov 4, 2025
2fd2467
combining emulator tests to fix dependancy issue
briochh Nov 4, 2025
bb9b7f2
trying to get exes picked up on windows
briochh Nov 4, 2025
a00dbfe
trying to get exes picked up on windows
briochh Nov 4, 2025
c3c98cc
trying to get exes picked up on windows
briochh Nov 4, 2025
e702609
trying to get exes picked up on windows
briochh Nov 4, 2025
c2cf579
trying to get exes picked up on windows
briochh Nov 4, 2025
3b3d686
trying to get exes picked up on windows
briochh Nov 4, 2025
dbc2d0c
trying to get exes picked up on windows
briochh Nov 4, 2025
a793e38
trying to get exes picked up on windows
briochh Nov 4, 2025
dae11aa
trying to get exes picked up on windows
briochh Nov 4, 2025
ae6b587
trying to get exes picked up on windows
briochh Nov 4, 2025
38e3620
trying to get exes picked up on windows
briochh Nov 4, 2025
a4afb68
trying to get exes picked up on windows
briochh Nov 4, 2025
e10261d
trying to get exes picked up on windows
briochh Nov 4, 2025
b6e36c3
adding back more tests
briochh Nov 4, 2025
724a60e
adding pytest timeout -- suspect pyworkers competing
briochh Nov 4, 2025
1e984b8
increasing timeout for emulator tests -- 13mins! yesh
briochh Nov 5, 2025
b651292
trying to prevent file clashes in utils tests
briochh Nov 5, 2025
60d9fc2
trying to prevent file clashes in utils tests
briochh Nov 5, 2025
ba975f4
pypestworker tests debugging
briochh Nov 5, 2025
aa536f9
pypestworker test misbehaving on ubuntu --try split out to non xdist
briochh Nov 5, 2025
79ffa49
pypestworker test misbehaving on ubuntu --try split out to non xdist
briochh Nov 5, 2025
c2f8e43
ppu tests also hanging with xdist on linux -- try improve timeout
briochh Nov 5, 2025
fffb354
urgh checking py3.13
briochh Nov 5, 2025
76ed558
xdist n1
briochh Nov 5, 2025
cb734ee
xdist off
briochh Nov 5, 2025
97b6a3f
ppu test skip
briochh Nov 5, 2025
2547715
geostat prior builder test skip
briochh Nov 5, 2025
18ed1df
ppw test back into main
briochh Nov 5, 2025
592192b
xdist back
briochh Nov 5, 2025
622c83d
py3.12 again
briochh Nov 5, 2025
04efdfe
ppu test back, xdist on
briochh Nov 5, 2025
72ed470
test_geostat_prior_builder back in
briochh Nov 5, 2025
fb09fd1
test_geostat_prior_builder back in
briochh Nov 5, 2025
ab37a78
just geostat prior builder
briochh Nov 5, 2025
f83a3d6
just geostat prior builder w/o cov cleanup
briochh Nov 5, 2025
f0c678c
feel like this is full circle, whole utils.py, xdist etc
briochh Nov 5, 2025
3e72b6a
just *geostat*
briochh Nov 5, 2025
6cb313d
seems to be a combo issue -- geostat or smp
briochh Nov 5, 2025
82fd669
chdir issue, geostat or fake
briochh Nov 5, 2025
0ec24a9
geostat or fake or budget or smp
briochh Nov 5, 2025
d9e0407
geostat or _test
briochh Nov 5, 2025
590f742
full circle again, all utils.py
briochh Nov 5, 2025
99dcdee
all tests without budget
briochh Nov 5, 2025
b305f1d
tidying up some potential chdir issues
briochh Nov 5, 2025
ec098e6
mem tidy in geostat builder
briochh Nov 5, 2025
cded68c
Xdist off again
briochh Nov 5, 2025
83da275
Update pyproject.toml
briochh Nov 5, 2025
e75877d
Update pyproject.toml
briochh Nov 5, 2025
8381363
Update pyproject.toml
briochh Nov 5, 2025
4b8de70
listing env searching for np.inv issue
briochh Nov 6, 2025
e4a56d8
listing env searching for np.inv issue
briochh Nov 6, 2025
956e62d
update lock
briochh Nov 6, 2025
1415279
just inverting tests
briochh Nov 6, 2025
d0112f7
just geostat prior again
briochh Nov 6, 2025
004248e
just geostat prior again
briochh Nov 6, 2025
2821ac7
just geostat prior again
briochh Nov 6, 2025
6b93356
just geostat prior again
briochh Nov 6, 2025
d4dd508
Update ci.yml
briochh Nov 6, 2025
acdb6e6
Update ci.yml
briochh Nov 6, 2025
f5ad1de
Update ci.yml
briochh Nov 6, 2025
54e26fe
Update ci.yml
briochh Nov 6, 2025
3746d30
Update ci.yml
briochh Nov 6, 2025
ff75cf8
Update ci.yml
briochh Nov 6, 2025
6e67420
Update ci.yml
briochh Nov 6, 2025
f393f6e
skipping ok_grid_zone
briochh Nov 6, 2025
9c9417c
skipping ok_grid_zone
briochh Nov 6, 2025
afd68f4
skipping ok_grid_zone, xdist on
briochh Nov 6, 2025
a3c7b39
adding ok_grid_zone but num_threads=1
briochh Nov 6, 2025
96ad228
just geostat_prior_builder and ok_grid_zone
briochh Nov 7, 2025
d95f42a
trying to add scipy-openblas, but not sure if it will be used on the CI
briochh Nov 7, 2025
80974e4
trying to get blas version reported
briochh Nov 7, 2025
dd17940
wtf
briochh Nov 7, 2025
7c25a90
makes no sense -- trying np.show_config() in ok_grid_zone
briochh Nov 7, 2025
b9e447d
makes no sense -- need an additional test calling np.show_config()?
briochh Nov 7, 2025
23a37eb
makes no sense -- need an additional test calling np.show_config()?
briochh Nov 7, 2025
48e0550
Merge branch 'develop' into feat_uv
briochh Nov 7, 2025
7e03aee
num_thread=1 and emulator tests on
briochh Nov 7, 2025
3e15a7a
num_thread=1 and emulator tests on
briochh Nov 7, 2025
d521a5c
all tests back on
briochh Nov 8, 2025
1c22cdb
notebook coverage (again)
briochh Nov 8, 2025
d553d40
cov append for notebooks
briochh Nov 9, 2025
6bef0a9
subprocess for cov
briochh Nov 9, 2025
fb93001
ignore strings
briochh Nov 9, 2025
6eacefe
ignore strings
briochh Nov 9, 2025
252a04e
utils tests on
briochh Nov 9, 2025
29a36c9
just exclude pstfrom tests
briochh Nov 9, 2025
d09fb57
dsivc timeout 1200
briochh Nov 9, 2025
7c46aa3
more timeout flex
briochh Nov 9, 2025
abb64fe
just pstfrom tests
briochh Nov 9, 2025
d02cf27
pinning numpy as experiment
briochh Nov 10, 2025
46977c2
testing codecov
briochh Nov 10, 2025
21b297e
all os and py
briochh Nov 10, 2025
909275f
"codecov not picking up legacy omit"
briochh Nov 10, 2025
d213622
requiring scipy-openblas64
briochh Nov 10, 2025
08b02fd
urgh just py3.14
briochh Nov 10, 2025
a90e109
env update lock
briochh Nov 10, 2025
2460b0f
all py versions
briochh Nov 10, 2025
55ce123
pstfrom test troubleshooting
briochh Nov 11, 2025
d7f974b
pstfrom test troubleshooting
briochh Nov 11, 2025
691b3e4
pstfrom test troubleshooting
briochh Nov 11, 2025
bbac354
pstfrom test troubleshooting
briochh Nov 11, 2025
1114942
getting numpy blas spec reported
briochh Nov 11, 2025
2eb564b
testing openblas pin<0.3.30
briochh Nov 11, 2025
bd4c092
Merge branch 'develop' of github.com:briochh/pyemu into develop
briochh Nov 11, 2025
33a96ac
Merge branch 'develop' into feat_uv
briochh Nov 11, 2025
efddd61
trying to get hang traceback
briochh Nov 11, 2025
8225bcd
Merge branch 'develop' into feat_uv
briochh Nov 11, 2025
1055b4f
pinning numpy<2.3.2
briochh Nov 11, 2025
cc5d36a
py 3.10 - 3.13
briochh Nov 11, 2025
c6c74f5
Update ci.yml
briochh Nov 11, 2025
d6ecd7a
Update ci.yml
briochh Nov 12, 2025
4b48583
Update conftest.py
briochh Nov 12, 2025
1d90952
ignore properly
briochh Nov 12, 2025
c1d90aa
Merge branch 'feat_pestppnightly' into feat_uv
briochh Nov 12, 2025
4abcb67
file clean
briochh Nov 12, 2025
a407462
should be skipping legacy
briochh Nov 12, 2025
8e905b8
just one conftest...?
briochh Nov 12, 2025
b300703
testing coverage config in .rc
briochh Nov 13, 2025
4f3d6fd
toml again
briochh Nov 13, 2025
3e035f9
all tests
briochh Nov 13, 2025
e026759
Merge branch 'feat_pestppnightly' into feat_uv
briochh Nov 13, 2025
f7e1c88
Merge branch 'feat_pestppnightly' into feat_uv
briochh Nov 13, 2025
e694b6b
Merge branch 'develop' into feat_uv
briochh Dec 9, 2025
d133211
env update
briochh Dec 10, 2025
f2afb29
env update
briochh Dec 10, 2025
a0525bd
prep for publish test
briochh Dec 11, 2025
0ff5e9f
Merge remote-tracking branch 'origin' into feat_uv
briochh Dec 16, 2025
41ed323
Merge remote-tracking branch 'origin' into feat_uv
briochh Dec 17, 2025
02afa18
adding uv build and release github workflow
briochh Dec 17, 2025
8e1a443
updating release instruction .txt
briochh Dec 17, 2025
e63610d
updating release instruction .txt
briochh Dec 17, 2025
79b1cae
Bump version to 1.4.0.dev2
briochh Dec 17, 2025
3d91682
trying to work around blas thread issues with numpy > 2.3.5 (python >…
briochh Dec 17, 2025
0d7bf79
numpy pin fine tuning
briochh Dec 17, 2025
8f9c010
Bump dev version 1.4.0.dev3
briochh Dec 17, 2025
ce54a67
update readme
briochh Dec 18, 2025
54b7275
Merge branch 'develop' into migrate_uv
briochh Dec 18, 2025
161ea42
incorperating comments from MT and NMcD
briochh Dec 24, 2025
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
14 changes: 0 additions & 14 deletions .coveragerc

This file was deleted.

120 changes: 30 additions & 90 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,130 +40,70 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v5 # checksout this repo

- name: Set Windows ENV
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1

# Setup conda env
- name: Install Conda environment using micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-file: etc/environment.yml
environment-name: pyemu
create-args: >-
python=${{ matrix.python-version }}
cache-downloads: true
cache-environment: true
cache-environment-key: environment-${{ steps.date.outputs.date }}
cache-downloads-key: downloads-${{ steps.date.outputs.date }}

- name: Checkout pypestutils
uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v7
with:
repository: pypest/pypestutils
ref: develop
path: pypestutils

# - name: Install MinGW-w64 tools (Windows)
# if: runner.os == 'Windows'
# uses: msys2/setup-msys2@v2
# with:
# msystem: MINGW64
# path-type: inherit
## install: >-
## mingw-w64-x86_64-gcc-fortran
## mingw-w64-x86_64-lapack
## mingw-w64-x86_64-meson
## mingw-w64-x86_64-ninja

- name: Install meson and gfortran (for ppu)
shell: bash -l {0}
run: |
micromamba install meson gfortran

- name: Build pypestutils (Windows)
if: runner.os == 'Windows'
shell: bash -l {0}
working-directory: pypestutils
env:
LDFLAGS: -static-libgcc -static-libgfortran -static-libquadmath -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive
run: |
scripts/build_lib.sh

- name: Build pypestutils (non-Windows)
if: runner.os != 'Windows'
shell: bash -l {0}
working-directory: pypestutils
run: |
scripts/build_lib.sh

- name: Install pypestutils
shell: bash -l {0}
working-directory: pypestutils
run: |
pip install -e .
python-version: ${{ matrix.python-version }}

- name: Install pyemu
shell: bash -l {0}
- name: Install the project
run: |
pip install -e .
micromamba list
uv sync --locked --extra optional --extra tests
uv pip list

- name: Install Modflow executables
uses: modflowpy/install-modflow-action@v1

- name: Add executables directory to path
# need to explicitly use bash shell to get $GITHUB_PATH to work
shell: bash
run: |
echo "adding bin dir '$MODFLOW_BIN_PATH' to path"
echo "$MODFLOW_BIN_PATH" >> $GITHUB_PATH
echo "adding bin dir '$HOME/.local/bin' to path"
echo "$HOME/.local/bin" >> $GITHUB_PATH
echo $GITHUB_PATH

# order matters for this step - after setting path to executables
# order may matter for this step - after setting path to executables
- name: Install PEST++ suite using get-pestpp
# again think we need bash to get path expansion to work
shell: bash -l {0}
run: |
get-pestpp --owner pestpp --repo pestpp-nightly-builds :home
uv run get-pestpp --owner pestpp --repo pestpp-nightly-builds :home
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: ${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.test-path }}
- name: Verify PEST++ installation
shell: bash
run: |
echo "PATH: $PATH"
ls $HOME/.local/bin

- name: Run tests
# For example, using `pytest`
# once again need bash (I think) -- windows will run through mingw
shell: bash -l {0}
run: |
pytest ${{ matrix.test-path }} \
uv run pytest ${{ matrix.test-path }} \
-n=auto \
-rA -vv --tb=native \
--durations=20 \
--cov=pyemu --cov-report=lcov \
--timeout=1200 \
--cov=pyemu --cov-report=xml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Test Notebooks
if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == 3.12 }}
shell: bash -l {0}
run: |
pytest examples/*.ipynb \
uv run pytest examples/*.ipynb \
-rA -vv --tb=native \
--nbval-lax --dist loadscope \
--cov=pyemu --cov-report=lcov --cov-append
--cov=pyemu --cov-report=xml --cov-append
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Coveralls
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
flag-name: ${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.test-path }}
parallel: true
# path-to-lcov: autotest/coverage.lcov

coveralls_finish:
needs: pyemuCI
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v2
- name: Codecov
uses: codecov/codecov-action@v5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
# path-to-lcov: autotest/coverage.lcov
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
36 changes: 36 additions & 0 deletions .github/workflows/release.yml
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

workflow to publish release -- maybe more motivation here to build some smoke tests

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: "Publish"

on:
push:
tags:
# Publish on any tag starting with a `v`, e.g., v0.1.0
- v*

jobs:
run:
runs-on: ubuntu-latest
environment:
name: pypi
permissions:
id-token: write
contents: read
steps:
- name: Checkout
uses: actions/checkout@v5
- name: Install uv
uses: astral-sh/setup-uv@v7
- name: Install Python
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is a python installation step necessary? If using the uv_build backend, my understanding is that the build can be done without Python at all.

run: uv python install 3.13
- name: Build
run: uv build
# TODO: add some smoke tests here
Copy link
Contributor

@nathanjmcdougall nathanjmcdougall Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you do decide to add smoke tests, I think as a matter of security, you should separate the build+test and publish steps into separate stages. e.g. here

https://github.com/usethis-python/usethis-python/blob/main/.github/workflows/release.yml

The risk is that a compromised test dependency injects a payload into the testing runtime which pre-emptively publishes a malicious package to PyPI, since it's scoped under the id-token: write permission. Technically this risk can exist even in the build step, but the only dependency in this case is uv_build, so the risk is no higher than using uv in the first place.

You can read more about this from the Astral team here

https://docs.pyx.dev/publishing#trusted-publishing

For isolation reasons, we strongly recommend that you perform your distribution build in a separate job that your publishing job depends on. This ensures that your build environment does not have access to the short-lived credentials used for publishing.

In general (in a follow up PR) it might be good to consider using zizmor to shore up the GitHub Actions config a bit, from a security perspective

# - name: Smoke test (wheel)
# run: uv run --isolated --no-project --with dist/*.whl tests/smoke_test.py
# - name: Smoke test (source distribution)
# run: uv run --isolated --no-project --with dist/*.tar.gz tests/smoke_test.py
- name: Publish
run: uv publish
# The part below with testpypi only
# TODO: remove the next two lines for production usage
env:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently just pointing to test.pypi

UV_PUBLISH_URL: https://test.pypi.org/legacy/
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ message: If you use this software, please cite both the article from preferred-c
and the software itself.
type: software
title: pyEMU
version: 1.4.0
date-released: '2025-12-8'
version: 1.4.0.dev3
date-released: '2025-12-18'
abstract: A python package for interfacing with PEST and PEST++, and providing model-independent data-worth, and linear and non-linear uncertainty analyses.
repository-artifact: https://pypi.org/project/pyemu
repository-code: https://github.com/pypest/pyemu
Expand Down
4 changes: 3 additions & 1 deletion README.md
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be refined after merge

Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ ensemble generation and handling
Main branch:
[![pyemu continuous integration](https://github.com/pypest/pyemu/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/pypest/pyemu/actions/workflows/ci.yml)
[![Coverage Status](https://coveralls.io/repos/github/pypest/pyemu/badge.svg?branch=main)](https://coveralls.io/github/pypest/pyemu?branch=main)
[![codecov](https://codecov.io/gh/pypest/pyemu/branch/main/graph/badge.svg?token=bnrI1JKvbk)](https://codecov.io/gh/pypest/pyemu)

Develop branch:
[![pyemu continuous integration](https://github.com/pypest/pyemu/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/pypest/pyemu/actions/workflows/ci.yml)
[![Coverage Status](https://coveralls.io/repos/github/pypest/pyemu/badge.svg?branch=develop)](https://coveralls.io/github/pypest/pyemu?branch=develop)
[![codecov](https://codecov.io/gh/pypest/pyemu/graph/badge.svg?token=bnrI1JKvbk)](https://codecov.io/gh/pypest/pyemu)

Documentation
=============
Expand Down Expand Up @@ -104,7 +106,7 @@ pyEMU CI testing, using GitHub actions, has recently been switched over to run w
We make use of [pytest-xdist](https://pytest-xdist.readthedocs.io/en/latest/) for parallel execution.
Some notes that might be helpful for building your PR and testing:
* Test files are in [./autotest](https://github.com/pypest/pyemu/tree/develop/autotest)
* Pytest settings are in [./autotest/conftest.py](./autotest/conftest.py) and [./autotest/pytest.ini](./autotest/pytest.ini)
* Pytest settings are in [./autotest/conftest.py](./autotest/conftest.py) and [./pyproject.toml](autotest/pyproject.toml)
* Currently, files ending `_tests.py` are collected
* Functions starting `test_` or ending `_test` are collected
* ipython notebooks in [./examples](./examples) are also run
Expand Down
5 changes: 2 additions & 3 deletions autotest/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
collect_ignore = [
# "emulator_tests.py",
# "en_tests.py",
# "full_meal_deal_tests_2.py",
# "get_pestpp_tests.py",
# "la_tests.py",
# "mat_tests.py",
Expand All @@ -18,9 +17,8 @@
# "plot_tests.py",
# "pst_from_tests.py",
# "pst_tests.py",
# "pst_tests_2.py",
# "transformer_tests.py",
# "utils_tests.py"
# "utils_tests.py",
# "verf_test.py",
]

Expand Down Expand Up @@ -50,6 +48,7 @@ def get_exe_path(exe_name, forgive=True):
exe_path = Path(exe_path, "mac")
else:
exe_path = Path(exe_path, "win")
# if is isn't in bin/<platform> either, give up
if not (exe_path / exe_name).exists():
if forgive:
print(f"Executable {exe_name} not found in {exe_path}, returning None")
Expand Down
13 changes: 9 additions & 4 deletions autotest/pst_from_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ def test_freyberg(tmp_path):
import numpy as np
import pandas as pd
from pyemu import PyemuWarning
np.show_config()

pd.set_option('display.max_rows', 500)
pd.set_option('display.max_columns', 500)
pd.set_option('display.width', 1000)
Expand Down Expand Up @@ -295,9 +297,12 @@ def test_freyberg(tmp_path):
assert np.isclose(pst.phi, 0.), pst.phi


@pytest.mark.timeout(method='thread')
def test_freyberg_prior_build(tmp_path):
import numpy as np
import pandas as pd
np.show_config()

pd.set_option('display.max_rows', 500)
pd.set_option('display.max_columns', 500)
pd.set_option('display.width', 1000)
Expand Down Expand Up @@ -2428,7 +2433,7 @@ def mf6_freyberg_varying_idomain(tmp_path):
print(model_file,sim_val,arr.mean())


def xsec_test(tmp_path):
def test_xsec(tmp_path):
import numpy as np
import pandas as pd
pd.set_option('display.max_rows', 500)
Expand Down Expand Up @@ -6249,7 +6254,7 @@ def invest_vertexpp_setup_speed():
pass


def xsec_pars_as_obs_test(tmp_path):
def test_xsec_pars_as_obs(tmp_path):
import numpy as np
import pandas as pd
pd.set_option('display.max_rows', 500)
Expand Down Expand Up @@ -6455,7 +6460,7 @@ def draw_consistency_test(tmp_path):

if __name__ == "__main__":
draw_consistency_test('.')
#xsec_pars_as_obs_test(".")
#test_xsec_pars_as_obs(".")
#add_py_function_test('.')
#mf6_freyberg_pp_locs_test('.')
#mf6_subdir_test(".")
Expand Down Expand Up @@ -6484,7 +6489,7 @@ def draw_consistency_test(tmp_path):
#plot_thresh("master_thresh")
#plot_thresh("master_thresh_mm")
#mf6_freyberg_varying_idomain()
# xsec_test()
# test_xsec()
# mf6_freyberg_short_direct_test()
# mf6_add_various_obs_test()
# mf6_subdir_test()
Expand Down
4 changes: 0 additions & 4 deletions autotest/pytest.ini
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

options now in pyproject.toml

This file was deleted.

Loading