-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #431 from spacetelescope/release-0.20.0
Release 0.20.0 [master]
- Loading branch information
Showing
54 changed files
with
1,405 additions
and
815 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,3 +11,4 @@ docs/source/api/ | |
| *.pytest_cache | ||
| htmlcov/ | ||
| *.sqlite3 | ||
| jwql/website/static/*.csv | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,39 @@ | ||
| // Obtain files from source control system. | ||
| if (utils.scm_checkout()) return | ||
|
|
||
| matrix_os = ["linux-stable"] | ||
| matrix_python = ["3.5", "3.6"] | ||
| matrix = [] | ||
|
|
||
| withCredentials([string( | ||
| credentialsId: 'jwql-codecov', | ||
| variable: 'codecov_token')]) { | ||
|
|
||
| // Define each build configuration, copying and overriding values as necessary. | ||
| bc0 = new BuildConfig() | ||
| bc0.nodetype = "linux-stable" | ||
| bc0.name = "debug" | ||
| bc0.build_cmds = [ | ||
| "conda env update --file=environment.yml", | ||
| "pip install codecov pytest-cov", | ||
| "with_env -n jwql python setup.py install"] | ||
| bc0.test_cmds = [ | ||
| "with_env -n jwql pytest -s --junitxml=results.xml --cov=./jwql/ --cov-report xml", | ||
| "codecov --token=${codecov_token}"] | ||
|
|
||
| // bc1 = utils.copy(bc0) | ||
| // bc1.build_cmds[0] = "conda install -q -y python=3.5" | ||
| for (os in matrix_os) { | ||
| for (python_ver in matrix_python) { | ||
| // Define each build configuration, copying and overriding values as necessary. | ||
| env_py = "_python_${python_ver}".replace(".", "_") | ||
| bc = new BuildConfig() | ||
| bc.nodetype = os | ||
| bc.name = "debug-${os}-${env_py}" | ||
| bc.conda_packages = ["python=${python_ver}"] | ||
| bc.build_cmds = [ | ||
| "conda env update --file=environment${env_py}.yml", | ||
| "pip install codecov pytest-cov", | ||
| "python setup.py install"] | ||
| bc.test_cmds = [ | ||
| "pytest -s --junitxml=results.xml --cov=./jwql/ --cov-report=xml:coverage.xml", | ||
| "sed -i 's/file=\"[^\"]*\"//g;s/line=\"[^\"]*\"//g;s/skips=\"[^\"]*\"//g' results.xml", | ||
| "codecov --token=${codecov_token}", | ||
| "mkdir -v reports", | ||
| "mv -v coverage.xml reports/coverage.xml"] | ||
| matrix += bc | ||
| } | ||
| } | ||
| // bc1 = utils.copy(bc0) | ||
| // bc1.build_cmds[0] = "conda install -q -y python=3.5" | ||
|
|
||
| // Iterate over configurations that define the (distibuted) build matrix. | ||
| // Spawn a host of the given nodetype for each combination and run in parallel. | ||
| utils.run([bc0]) | ||
| // Iterate over configurations that define the (distibuted) build matrix. | ||
| // Spawn a host of the given nodetype for each combination and run in parallel. | ||
| utils.run(matrix) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| channels: | ||
| - http://ssb.stsci.edu/astroconda-dev | ||
| - defaults | ||
| dependencies: | ||
| - asdf=2.3.0 | ||
| - astropy>=3.1.2 | ||
| - astroquery=0.3.9 | ||
| - bokeh=0.13.0 | ||
| - crds>=7.2.7 | ||
| - django=2.1.1 | ||
| - inflection=0.3.1 | ||
| - ipython=6.5.0 | ||
| - jinja2=2.10 | ||
| - jwst=0.13.0 | ||
| - matplotlib=3.0.0 | ||
| - numpy=1.15.2 | ||
| - numpydoc=0.8.0 | ||
| - pandas=0.23.4 | ||
| - postgresql=9.6.6 | ||
| - psycopg2=2.7.5 | ||
| - python=3.5.6 | ||
| - python-dateutil=2.7.3 | ||
| - pytest=3.8.1 | ||
| - pytest-cov=2.6.0 | ||
| - pytest-html=1.19.0 | ||
| - sphinx=2.0.1 | ||
| - sphinx_rtd_theme=0.1.9 | ||
| - sqlalchemy=1.2.11 | ||
| - stsci_rtd_theme=0.0.2 | ||
| - pip: | ||
| - authlib==0.10 | ||
| - codecov==2.0.15 | ||
| - jwedb>=0.0.3 | ||
| - pysiaf==0.2.5 | ||
| - sphinx-automodapi==0.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,35 @@ | ||
| name: jwql | ||
| channels: | ||
| - http://ssb.stsci.edu/astroconda-dev | ||
| - defaults | ||
| dependencies: | ||
| - asdf=2.3.1 | ||
| - astropy>=3.1.2 | ||
| - astroquery=0.3.9 | ||
| - bokeh=1.1.0 | ||
| - bokeh=1.2.0 | ||
| - crds>=7.2.7 | ||
| - django=2.1.7 | ||
| - ipython=7.3.0 | ||
| - inflection=0.3.1 | ||
| - ipython=7.5.0 | ||
| - jinja2=2.10 | ||
| - jwst=0.13.1 | ||
| - matplotlib=3.0.2 | ||
| - numpy=1.16.2 | ||
| - numpydoc=0.8.0 | ||
| - numpy=1.16.4 | ||
| - numpydoc=0.9.0 | ||
| - pandas=0.24.2 | ||
| - postgresql=9.6.6 | ||
| - psycopg2=2.7.5 | ||
| - python=3.6.4 | ||
| - python-dateutil=2.7.5 | ||
| - pytest=4.4.0 | ||
| - pytest=4.5.0 | ||
| - pytest-cov=2.6.1 | ||
| - pytest-html=1.19.0 | ||
| - sphinx=1.8.5 | ||
| - sphinx=2.0.1 | ||
| - sphinx_rtd_theme=0.1.9 | ||
| - sqlalchemy=1.3.3 | ||
| - stsci_rtd_theme=0.0.2 | ||
| - pip: | ||
| - authlib==0.10 | ||
| - codecov==2.0.15 | ||
| - jwedb>=0.0.3 | ||
| - pysiaf==0.2.5 | ||
| - sphinx-automodapi==0.10 |
Oops, something went wrong.