Skip to content

Commit

Permalink
Cleaned up dependencies (#125)
Browse files Browse the repository at this point in the history
Clean up build dependencies:
 - Added scikit-image dependency to fix stistools.defringe.mkfringeflat import of astropy.nddata.utils.block_reduce(). - Removed documentation packages from setup.py and moved to doc/environment.yml
 - Updated doc/environment.yml with proper doc build dependencies
 - Moved test dependencies to setup.py tests_require
 - Changed nose dependency to pytest
 - Added commented-out dependencies from testing code that are not called: crds, requests
 - Removed unused nightly test JenkinsfileRT for now
 - Moved conftest.py to tests/ directory to get fixtures to work with pytest properly
 - Retained ipython doc env dependency (but accidentally moved it in the list between commits)
  • Loading branch information
sean-lockwood authored Jul 17, 2020
1 parent b9928f1 commit 8488ce3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bc1.name = "release"
// Would be nice if Jenkins can access /grp/hst/cdbs/xxxx directly.
bc1.env_vars = ['TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory']
bc1.conda_channels = ['http://ssb.stsci.edu/astroconda']
bc1.conda_packages = ['python=3.6', 'pytest', 'crds', 'hstcal', 'scikit-image']
bc1.conda_packages = ['python=3.6', 'pytest', 'crds', 'hstcal']
bc1.build_cmds = ["pip install -e .[test,all]"]
bc1.test_cmds = ["pytest --basetemp=tests_output --junitxml results.xml --bigdata -v"]
bc1.failedUnstableThresh = 1
Expand Down
33 changes: 0 additions & 33 deletions JenkinsfileRT

This file was deleted.

2 changes: 1 addition & 1 deletion doc/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ dependencies:
- scipy>=0.14
- sphinx=1.8
- stsci.tools
- ipython
- d2to1
- stsci.distutils
- stsci.tools
- ipython
- pip:
- stsci_rtd_theme
- sphinx_automodapi
12 changes: 7 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,16 @@
],
install_requires = [
'astropy',
'nose',
'numpy',
'numpydoc',
'scipy',
'sphinx',
'sphinx_rtd_theme',
'stsci_rtd_theme',
'stsci.tools',
'scikit-image',
],
tests_require = [
'pytest',
'six',
#'requests',
#'crds',
],
packages = find_packages(),
package_data = {
Expand Down
File renamed without changes.

0 comments on commit 8488ce3

Please sign in to comment.