From 590dcffb80c7b4f3908992697b350f63b0f0af8f Mon Sep 17 00:00:00 2001 From: Brendan Gannon Date: Thu, 17 Feb 2022 13:21:09 -0500 Subject: Fixing numpy build time version + build script resolution for python dependency egg + fixing recipe version spacing issues (#754) Co-authored-by: Brendan Gannon --- drizzlepac/build.sh | 2 +- drizzlepac/meta.yaml | 21 ++++++++++----------- specutils/build.sh | 2 +- webbpsf/build.sh | 3 +-- webbpsf/meta.yaml | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh index 0079b1d..cba252e 100644 --- a/drizzlepac/build.sh +++ b/drizzlepac/build.sh @@ -1,4 +1,4 @@ #pip install --no-deps --upgrade sphinx-automodapi #$PYTHON setup.py build build_ext --inplace -- build_sphinx -$PYTHON setup.py install +$PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index fe70fa9..bf1b0ac 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -17,8 +17,8 @@ package: requirements: build: - acstools - - astropy>=4.0.0 - - astroquery>=0.4 + - astropy >=4.0.0 + - astroquery >=0.4 - bokeh - fitsblender - graphviz @@ -26,25 +26,25 @@ requirements: - lxml - nictools - nose - - scikit-learn>=0.20 + - scikit-learn >=0.20 - scipy - secretstorage [linux] - spherical-geometry - - stsci.image>=2.3.4 + - stsci.image >=2.3.4 - stsci.imagestats - - stsci.skypac>=1.0.7 + - stsci.skypac >=1.0.7 - stsci.stimage - - stsci.tools>=4.0 - - stwcs>=1.5.3 + - stsci.tools >=4.0 + - stwcs >=1.5.3 - stregion - setuptools - pandas - - photutils>=1.0.0 + - photutils >=1.0.0 - pysynphot - pypdf2 - pytables - - tweakwcs>=0.7.2 - - numpy=>1.19 + - tweakwcs >=0.7.2 + - numpy {{ numpy }} - python {{ python }} run: - acstools @@ -76,7 +76,6 @@ requirements: - tweakwcs - numpy - python - source: git_tag: {{ version }} diff --git a/specutils/build.sh b/specutils/build.sh index 5a5aeeb..6df1dab 100644 --- a/specutils/build.sh +++ b/specutils/build.sh @@ -1 +1 @@ -$PYTHON setup.py install +$PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv diff --git a/webbpsf/build.sh b/webbpsf/build.sh index 56f0b30..6df1dab 100644 --- a/webbpsf/build.sh +++ b/webbpsf/build.sh @@ -1,2 +1 @@ - -$PYTHON setup.py install \ No newline at end of file +$PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml index fa6c7b3..88d78de 100644 --- a/webbpsf/meta.yaml +++ b/webbpsf/meta.yaml @@ -21,7 +21,7 @@ package: requirements: build: - astropy >=4.0.0 - - numpy >=1.18.0 + - numpy {{ numpy }} - numpydoc - scipy >=1.5.0 - matplotlib >=3.2.0 -- cgit