Skip to content

Commit

Permalink
Merge branch 'main' into median-memory
Browse files Browse the repository at this point in the history
  • Loading branch information
emolter authored Oct 10, 2024
2 parents f26167b + d64107a commit 5de32a3
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ jobs:
envs: |
- linux: py311-jwst-cov-xdist
- linux: py311-romancal-cov-xdist
coverage: codecov
1 change: 1 addition & 0 deletions changes/297.general.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update downstream tests for jwst and romancal to fix pytest configurations.
36 changes: 21 additions & 15 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
envlist =
check-{style,build,types}
test{,-warnings,-cov}-xdist
test-numpy{120,121,122}
test-{jwst,romancal}-xdist
test-{jwst,romancal}{,-xdist}{,-cov}
build-{docs,dist}

# tox environments are constructed with so-called 'factors' (or terms)
Expand Down Expand Up @@ -45,18 +44,19 @@ commands =
[testenv]
description =
run tests
jwst: of JWST pipeline
romancal: of Romancal pipeline
oldestdeps: with the oldest supported version of key dependencies
warnings: treating warnings as errors
cov: with coverage
xdist: using parallel processing
change_dir =
jwst,romancal: {env_tmp_dir}
extras =
test
allowlist_externals =
git
jwst,romancal: bash
deps =
xdist: pytest-xdist
jwst: jwst[test] @ git+https://github.com/spacetelescope/jwst.git
romancal: romancal[test] @ git+https://github.com/spacetelescope/romancal.git
oldestdeps: minimum_dependencies
devdeps: numpy>=0.0.dev0
devdeps: scipy>=0.0.dev0
Expand All @@ -71,25 +71,31 @@ deps =
use_develop = true
pass_env =
CI
WEBBPSF_PATH
romancal: WEBBPSF_PATH
set_env =
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/liberfa/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
jwst: CRDS_SERVER_URL=https://jwst-crds.stsci.edu
romancal: CRDS_SERVER_URL=https://roman-crds.stsci.edu
jwst,romancal: CRDS_PATH={package_root}/crds_cache
jwst,romancal: CRDS_CLIENT_RETRY_COUNT=3
jwst,romancal: CRDS_CLIENT_RETRY_DELAY_SECONDS=20
romancal: CRDS_SERVER_URL = https://roman-crds.stsci.edu
jwst: CRDS_SERVER_URL = https://jwst-crds.stsci.edu
jwst,romancal: CRDS_PATH = {package_root}/crds_cache
jwst,romancal: CRDS_CLIENT_RETRY_COUNT = 3
jwst,romancal: CRDS_CLIENT_RETRY_DELAY_SECONDS = 20
commands_pre =
oldestdeps: minimum_dependencies stcal --filename requirements-min.txt
oldestdeps: pip install -r requirements-min.txt
jwst,romancal: bash -c "pip freeze -q | grep 'stcal @' > {env_tmp_dir}/requirements.txt"
jwst: git clone https://github.com/spacetelescope/jwst.git
romancal: git clone https://github.com/spacetelescope/romancal.git
jwst: pip install -e jwst[test]
romancal: pip install -e romancal[test]
jwst,romancal: pip install -r {env_tmp_dir}/requirements.txt
pip freeze
commands =
pytest \
warnings: -W error \
xdist: -n auto \
jwst: --pyargs jwst --ignore-glob=timeconversion --ignore-glob=associations --ignore-glob=*/scripts/* \
romancal: --pyargs romancal \
cov: --cov=. --cov-config=pyproject.toml --cov-report=term-missing --cov-report=xml \
jwst: jwst \
romancal: romancal \
cov: --cov={package_root} --cov-config={package_root}/pyproject.toml --cov-report=term-missing --cov-report=xml \
{posargs}

[testenv:build-docs]
Expand Down

0 comments on commit 5de32a3

Please sign in to comment.