diff options
author | James E.H. Turner <jturner@gemini.edu> | 2023-03-30 21:02:53 -0400 |
---|---|---|
committer | James E.H. Turner <jturner@gemini.edu> | 2023-03-30 21:02:53 -0400 |
commit | f7e28868ea942d2c9f97a05880b7241e55fa2dbe (patch) | |
tree | 7883675952662aa7361b24c75211a39aafcbeb7a | |
parent | 306d1c1444801a62a3a9e45bd1e3f6ea6a84f437 (diff) | |
download | astroconda-iraf-f7e28868ea942d2c9f97a05880b7241e55fa2dbe.tar.gz |
Update gemini_calmgr recipe for v1.1.22 (in new repo), to go with DRAGONS 3.1.
Add recipe for new gemini_obs_db package (v1.0.27), similar to gemini_calmgr.
Consolidate simple build scripts into meta.yaml & use template for version etc.
Convert packages to noarch since they are pure Python (otherwise we'd need 16 builds).
Use DRAGONS 3.1 version constraints, limiting sqlalchemy to <2.0 until the code can be ported to the new API.
-rw-r--r-- | gemini_calmgr/bld.bat | 3 | ||||
-rw-r--r-- | gemini_calmgr/build.sh | 13 | ||||
-rw-r--r-- | gemini_calmgr/meta.yaml | 27 | ||||
-rw-r--r-- | gemini_obs_db/meta.yaml | 32 |
4 files changed, 49 insertions, 26 deletions
diff --git a/gemini_calmgr/bld.bat b/gemini_calmgr/bld.bat deleted file mode 100644 index 228fa9e..0000000 --- a/gemini_calmgr/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ -# No idea whether this works; I copied it from rcardenes: -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 diff --git a/gemini_calmgr/build.sh b/gemini_calmgr/build.sh deleted file mode 100644 index eee4b72..0000000 --- a/gemini_calmgr/build.sh +++ /dev/null @@ -1,13 +0,0 @@ -cd local_calibs - -$PYTHON setup.py install --single-version-externally-managed --record=record.txt || exit 1 - -# # According to conda-forge #528 and the conda-forge docs, this seems to be a -# # newer way of doing the above (also need to add "pip" to build or host deps. -# # in meta.yaml), but it's not actually working for me with conda-build -# # 3.10.5; stick to the way AstroConda does it for now. -# $PYTHON -m pip install --no-deps --ignore-installed -vv . || exit 1 - -mkdir -p ${PREFIX}/share/gemini_calmgr/ -cp -p LICENSE ${PREFIX}/share/gemini_calmgr/ || exit 1 - diff --git a/gemini_calmgr/meta.yaml b/gemini_calmgr/meta.yaml index e3fe158..fa8ec8c 100644 --- a/gemini_calmgr/meta.yaml +++ b/gemini_calmgr/meta.yaml @@ -1,23 +1,30 @@ +{% set version = '1.1.22' %} +{% set tag = 'v' + version %} +{% set number = '0' %} + package: name: gemini_calmgr - version: "1.0.0" + version: {{ version }} source: - git_url: git@gitlab.gemini.edu:DRSoftware/FitsStorage.git - git_tag: 2020-2.20 # host FITSStorage repo has its own versioning... + git_url: git@github.com:GeminiDRSoftware/GeminiCalMgr.git + git_tag: {{ tag }} build: - number: '0' + number: {{ number }} + noarch: python + script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vv about: home: http://www.gemini.edu/sciops/data-and-results/processing-software license: BSD + license_file: LICENSE summary: Local calibration manager for use with DRAGONS requirements: build: - - python + - python >=3.7 + - pip - setuptools run: - - python - - astropy >=4.1 - - dragons >=3.0.0 - - numpy >=1.17 - - sqlalchemy >=1.3 + - python >=3.7 + - dragons >=3.1.0 + - gemini_obs_db >=1.0 + - sqlalchemy >=1.3,<2.0.0a0 # code not yet updated for new v2 API diff --git a/gemini_obs_db/meta.yaml b/gemini_obs_db/meta.yaml new file mode 100644 index 0000000..6d46e5d --- /dev/null +++ b/gemini_obs_db/meta.yaml @@ -0,0 +1,32 @@ +{% set version = '1.0.27' %} +{% set tag = 'v' + version %} +{% set number = '0' %} + +package: + name: gemini_obs_db + version: {{ version }} +source: + git_url: git@github.com:GeminiDRSoftware/GeminiObsDB.git + git_tag: {{ tag }} +build: + number: {{ number }} + noarch: python + script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vv +about: + home: http://www.gemini.edu/sciops/data-and-results/processing-software + license: BSD + license_file: LICENSE + summary: DB-backed classes to parse Gemini FITS metadata into various tables +requirements: + build: + - python >=3.7 + - pip + - setuptools + run: + - python >=3.7 + - astropy >=4.3 + - dragons >=3.1.0 + - numpy >=1.17 + - python-dateutil >=2.5.3 + - sqlalchemy >=1.3,<2.0.0a0 # code not yet updated for new v2 API + |