diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffb56d3ab..238edb90b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,3 +45,4 @@ jobs: envs: | - linux: py311-jwst-cov-xdist - linux: py311-romancal-cov-xdist + coverage: codecov diff --git a/changes/297.general.rst b/changes/297.general.rst new file mode 100644 index 000000000..7b2387181 --- /dev/null +++ b/changes/297.general.rst @@ -0,0 +1 @@ +Update downstream tests for jwst and romancal to fix pytest configurations. diff --git a/tox.ini b/tox.ini index 557aed11a..9591b5b65 100644 --- a/tox.ini +++ b/tox.ini @@ -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) @@ -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 @@ -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]