diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev deleted file mode 100644 index 92e7c96..0000000 --- a/JenkinsfileRT_dev +++ /dev/null @@ -1,57 +0,0 @@ -pipeline { - agent { label 'macos' } - environment { - HOME="${WORKSPACE}" - TEST_BIGDATA="https://bytesalad.stsci.edu/artifactory/romanisim" - CRDS_SERVER_URL = "https://roman-crds.stsci.edu" - CRDS_PATH = "${WORKSPACE}/crds_cache" - PYSYN_CDBS="${WORKSPACE}/cdbs" - PATH ="${WORKSPACE}/miniconda3/bin:${PATH}" - TMPDIR="${WORKSPACE}/tmp" - XDG_CACHE_HOME="${WORKSPACE}/tmp/.cache" - } - - stages { - stage('Setup') { - steps { - deleteDir() - checkout scm - sh("curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o installer.sh") - sh("bash installer.sh -b -p ${WORKSPACE}/miniconda3") - sh("conda init bash") - sh("conda create -n romanisim python -y") - } - } - stage('Install') { - steps { - sh("""#!/usr/bin/env bash - source $WORKSPACE/miniconda3/etc/profile.d/conda.sh - conda activate romanisim - pip install -e .[test] pytest-xdist - """ - ) - } - } - stage('Test') { - steps { - sh("mkdir ${WORKSPACE}/data") - sh("curl -L https://stsci.box.com/shared/static/0ojjfg3cieqdpd18vl1bjnpe63r82dx8.gz -o ${WORKSPACE}/data/webbpsf-data.tar.gz") - sh("tar -xzvf ${WORKSPACE}/data/webbpsf-data.tar.gz -C ${WORKSPACE}/data") - sh("mkdir ${WORKSPACE}/data/galsim-data") - sh("curl -L https://github.com/GalSim-developers/GalSim/raw/releases/2.4/examples/data/real_galaxy_catalog_23.5_example.fits -o ${WORKSPACE}/data/galsim-data/real_galaxy_catalog_23.5_example.fits") - sh("curl -L https://github.com/GalSim-developers/GalSim/raw/releases/2.4/examples/data/real_galaxy_catalog_23.5_example_selection.fits -o ${WORKSPACE}/data/galsim-data/real_galaxy_catalog_23.5_example_selection.fits") - sh("curl -L https://github.com/GalSim-developers/GalSim/raw/releases/2.4/examples/data/real_galaxy_catalog_23.5_example_fits.fits -o ${WORKSPACE}/data/galsim-data/real_galaxy_catalog_23.5_example_fits.fits") - sh("""#!/usr/bin/env bash - source ${WORKSPACE}/miniconda3/etc/profile.d/conda.sh - export WEBBPSF_PATH="${WORKSPACE}/data/webbpsf-data" - export GALSIM_CAT_PATH="${WORKSPACE}/data/galsim-data/real_galaxy_catalog_23.5_example.fits" - conda activate romanisim - pytest romanisim \ - --bigdata --slow --basetemp=test_outputs \ - -n 0 # -n 8 causes problems with CRDS runs? - """ - ) - } - } - } -} \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 610f872..62af85b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,12 +19,12 @@ classifiers = [ dependencies = [ "asdf >=3.3.0", "astropy >=5.3", - "crds >=11.16.16", + "crds >=11.16.21", "defusedxml >=0.5.0", "galsim >=2.5.1", "rad >=0.23.0", "roman_datamodels >=0.23.0", - "gwcs >=0.19.0, <0.24.0", + "gwcs >=0.20.0, <0.24.0", "jsonschema >=4.8", "numpy >=1.24", "stpsf >=2.0.0", diff --git a/tox.ini b/tox.ini index 6fa44c5..fa595b5 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,7 @@ pass_env = CRDS_* TEST_BIGDATA CODECOV_* - WEBBPSF_PATH + STPSF_PATH GALSIM_CAT_PATH FFTW_DIR LIBRARY_PATH