diff --git a/.github/ISSUE_TEMPLATE/release_aca.md b/.github/ISSUE_TEMPLATE/release_aca.md new file mode 100644 index 00000000..7d4d9c12 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/release_aca.md @@ -0,0 +1,41 @@ +--- +name: Ska3-aca Release +about: Release a new version of ska3-aca +title: Release ska3-aca +labels: Package update +assignees: '' + +--- + +# Packages to include + +- List package name+version or github issue number + +### Package and Test + +- [ ] Create branch named {version}-branch +- [ ] Create PR titled {version} from {version}-branch into master +- [ ] Create a pre-release `{version}rc{N}` at the latest commit in the branch +- [ ] Check packages are built. +- [ ] Promote packages from `masters` to `test` conda channel as kadi user (`skare3-promote --ska3-conda /proj/sot/ska/www/ASPECT/ska3-conda --to test ...`). +- [ ] List in PR any data products that need to be promoted to $SKA/data (check PR's interface impacts). +- [ ] `python -m compileall $SKA/lib` +- [ ] Confirm that test data (SKA/data) is appropriate for release testing (any custom test data is set or previous test data cleaned out) +- [ ] Run testr on HEAD. +- [ ] Add related issues to PR (`skare3-milestone-issues ...`). +- [ ] Document all changes (`skare3-changes-summary ...`). +- [ ] Write summary + highlight relevant changes. +- [ ] Document test results (`skare3-test-dashboard ...`). +- [ ] Wait for PR approval. + +### Promote: +- [ ] Promote packages to `flight` conda channel (`skare3-promote ...`). +- [ ] Announce to aca@cfa/slack. +- [ ] Update ska3/aca on HEAD as aca user. +- [ ] Confirm installed versions of ska3-aca and ska3-perl on HEAD with `conda list` +- [ ] `python -m compileall $SKA/lib` +- [ ] Promote any data products listed in PR to be promoted. +- [ ] Run testr on HEAD. +- [ ] Document test results (`skare3-test-dashboard ...`). +- [ ] Announce to aca@cfa/slack. +- [ ] Merge PR. diff --git a/.github/PULL_REQUEST_TEMPLATE/ska3-aca.md b/.github/PULL_REQUEST_TEMPLATE/ska3-aca.md new file mode 100644 index 00000000..37ab7db3 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/ska3-aca.md @@ -0,0 +1,20 @@ +# ska3-aca {version} + +This PR includes: +- + +## Interface Impacts: + +## Testing: + +## Review + +All operations critical or impacting PR's are independently and carefully reviewed. For other PR's the level of detail for review is calibrated to operations criticality. Some PR's that are confined to aspect-team-specific processing may have little to no independent review. + +## Deployment + +ska3-aca {version} will be promoted to flight as soon as this PR is approved. + +# Code changes + +# Related Issues diff --git a/patch_instructions/osx-64/patch_instructions.json b/patch_instructions/osx-64/patch_instructions.json index 8d649250..ee2716f3 100644 --- a/patch_instructions/osx-64/patch_instructions.json +++ b/patch_instructions/osx-64/patch_instructions.json @@ -79,6 +79,18 @@ "h5py-3.12.1-nompi_py312hf5b0cce_103.conda": { "license_family": "BSD" }, + "hdf5-1.14.4-nompi_h1607680_105.conda": { + "depends": [ + "__osx >=10.13", + "libaec >=1.1.3,<2.0a0", + "libcurl >=8.10.1,<9.0a0", + "libcxx >=18", + "libgfortran >=5", + "libgfortran5 >=13.2.0", + "libzlib >=1.3.1,<2.0a0", + "openssl >=3.4.0,<4.0a0" + ] + }, "icu-75.1-h120a0e1_0.conda": { "license_family": "MIT" }, @@ -133,6 +145,12 @@ "license_family": "BSD" }, "libopenblas-0.3.28-openmp_hbf64a52_1.conda": { + "depends": [ + "__osx >=10.13", + "libgfortran >=5", + "libgfortran5 >=13.2.0", + "llvm-openmp >=18.1.8" + ], "license_family": "BSD" }, "libre2-11-2024.07.02-h0e468a2_2.conda": { @@ -273,6 +291,23 @@ "scipy-1.14.1-py312h3b0f538_2.conda": { "license_family": "BSD" }, + "scipy-1.15.2-py312hd04560d_0.conda": { + "depends": [ + "__osx >=10.13", + "libblas >=3.9.0,<4.0a0", + "libcblas >=3.9.0,<4.0a0", + "libcxx >=18", + "libgfortran >=5", + "libgfortran5 >=13.2.0", + "liblapack >=3.9.0,<4.0a0", + "numpy <2.5", + "numpy >=1.19,<3", + "numpy >=1.23.5", + "python >=3.12,<3.13.0a0", + "python_abi 3.12.* *_cp312" + ], + "license_family": "BSD" + }, "simdjson-3.11.3-h9275861_0.conda": { "license_family": "APACHE" }, diff --git a/patch_instructions/osx-arm64/patch_instructions.json b/patch_instructions/osx-arm64/patch_instructions.json index 9a8215aa..cf02915d 100644 --- a/patch_instructions/osx-arm64/patch_instructions.json +++ b/patch_instructions/osx-arm64/patch_instructions.json @@ -79,6 +79,19 @@ "h5py-3.12.1-nompi_py312h34530d4_103.conda": { "license_family": "BSD" }, + "hdf5-1.14.4-nompi_ha698983_105.conda": { + "depends": [ + "__osx >=11.0", + "libaec >=1.1.3,<2.0a0", + "libcurl >=8.10.1,<9.0a0", + "libcxx >=18", + "libgfortran >=5", + "libgfortran5 >=13.2.0", + "libzlib >=1.3.1,<2.0a0", + "openssl >=3.4.0,<4.0a0" + ], + "license_family": "BSD" + }, "icu-75.1-hfee45f7_0.conda": { "license_family": "MIT" }, @@ -132,6 +145,12 @@ "license_family": "BSD" }, "libopenblas-0.3.28-openmp_hf332438_1.conda": { + "depends": [ + "__osx >=11.0", + "libgfortran >=5", + "libgfortran5 >=13.2.0", + "llvm-openmp >=18.1.8" + ], "license_family": "BSD" }, "libre2-11-2024.07.02-h07bc746_2.conda": { @@ -273,6 +292,24 @@ "scipy-1.14.1-py312h6bb24ec_2.conda": { "license_family": "BSD" }, + "scipy-1.15.2-py312h99a188d_0.conda": { + "depends": [ + "__osx >=11.0", + "libblas >=3.9.0,<4.0a0", + "libcblas >=3.9.0,<4.0a0", + "libcxx >=18", + "libgfortran >=5", + "libgfortran5 >=13.2.0", + "liblapack >=3.9.0,<4.0a0", + "numpy <2.5", + "numpy >=1.19,<3", + "numpy >=1.23.5", + "python >=3.12,<3.13.0a0", + "python >=3.12,<3.13.0a0 *_cpython", + "python_abi 3.12.* *_cp312" + ], + "license_family":"BSD" + }, "simdjson-3.11.3-ha393de7_0.conda": { "license_family": "APACHE" }, diff --git a/pkg_defs/ska3-aca/meta.yaml b/pkg_defs/ska3-aca/meta.yaml new file mode 100644 index 00000000..9111e743 --- /dev/null +++ b/pkg_defs/ska3-aca/meta.yaml @@ -0,0 +1,77 @@ +--- +package: + name: ska3-aca + version: 2025.5 + +build: + noarch: generic + +requirements: + run: + # The following packages are common to ska3- + - aca_view ==0.16.0 + - acis_taco ==4.2.3 + - acis_thermal_check ==5.3.1 + - acispy ==2.8.0 + - agasc ==4.23.0 + - backstop_history ==3.2.1 + - chandra_aca ==4.51.0 + - chandra_limits ==0.10.1 + - chandra_maneuver ==4.3.1 + - chandra_time ==4.2.0 + - cheta ==4.63.2 + - cxotime ==3.10.1 + - fot-matlab ==2.4.1 + - hopper ==4.6.0 + - kadi ==7.17.1 + - maude ==3.13.0 + - mica ==4.39.0 + - parse_cm ==3.17.0 + - proseco ==5.16.1 + - pyyaks ==4.5.0 + - quaternion ==4.3.1 + - ska-sphinx-theme ==1.3.0 + - ska3-core ==2025.5 + - ska3-template ==2022.06.02 + - ska_arc5gl ==4.0.1 + - ska_astro ==4.0.0 + - ska_dbi ==5.2.0 + - ska_file ==4.0.0 + - ska_ftp ==4.0.1 + - ska_helpers ==0.19.0 + - ska_matplotlib ==4.0.1 + - ska_numpy ==4.0.1 + - ska_parsecm ==4.0.1 + - ska_path ==3.1.2 + - ska_quatutil ==4.0.0 + - ska_shell ==4.1.1 + - ska_sun ==3.15.0 + - ska_sync ==4.13.0 + - ska_tdb ==4.1.0 + - sparkles ==4.29.0 + - starcheck ==14.14.0 + - testr ==4.13.0 + - xija ==4.33.2 + # The following packages are specific to ACA + - attitude_error_mon + - aca_hi_bgd + - aca_weekly_report + - acq_stat_reports + - acdc + - aimpoint_mon + - aperoll + - astromon + - annie + - fid_drift_mon + - find_attitude + - fss_check + - jobwatch + - kalman_watch + - perigee_health_plots + - schedule_view3 + - ska_report_ranges + - ska_trend + - skare3_tools + - vv_trending + - twiki-wg + - obc_rate_noise_plots diff --git a/pkg_defs/ska3-core/meta.yaml b/pkg_defs/ska3-core/meta.yaml index 83e8d1bf..cdefb9f7 100644 --- a/pkg_defs/ska3-core/meta.yaml +++ b/pkg_defs/ska3-core/meta.yaml @@ -1,7 +1,7 @@ --- package: name: ska3-core - version: 2025.4 + version: 2025.5 requirements: run: @@ -23,10 +23,10 @@ requirements: - arrow ==1.3.0 - asgiref ==3.3.4 - astroid ==3.3.8 - - astropy ==7.0.0 - - astropy-base ==7.0.0 + - astropy ==7.1.0 + - astropy-base ==7.1.0 - astropy-healpix ==1.0.3 - - astropy-iers-data ==0.2024.12.30.0.33.36 + - astropy-iers-data ==0.2025.6.9.0.39.3 - astropy-sphinx-theme ==1.1 - astroquery ==0.4.7 - asttokens ==3.0.0 @@ -73,14 +73,14 @@ requirements: - bzip2 ==1.0.8 - c-ares ==1.34.4 - c-blosc2 ==2.15.2 - - ca-certificates ==2024.12.14 + - ca-certificates ==2025.4.26 - cached-property ==1.5.2 - cached_property ==1.5.2 - cairo ==1.18.2 # [linux] - cctools ==1010.6 # [osx] - cctools_osx-64 ==1010.6 # [osx and not arm64] - cctools_osx-arm64 ==1010.6 # [arm64] - - certifi ==2024.12.14 + - certifi ==2025.1.31 - cffi ==1.17.1 - cfgv ==3.3.1 - chardet ==5.2.0 @@ -255,10 +255,8 @@ requirements: - libgcrypt-lib ==1.11.0 # [linux] - libgettextpo ==0.22.5 # [linux] - libgettextpo-devel ==0.22.5 # [linux] - - libgfortran ==14.2.0 # [linux] - - libgfortran ==5.0.0 # [osx] - - libgfortran5 ==13.2.0 # [osx] - - libgfortran5 ==14.2.0 # [linux] + - libgfortran ==14.2.0 # [linux or osx] + - libgfortran5 ==14.2.0 # [linux or osx] - libgl ==1.7.0 # [linux] - libglib ==2.82.2 - libglvnd ==1.7.0 # [linux] @@ -375,7 +373,7 @@ requirements: - oauthlib ==3.2.2 - openjpeg ==2.5.3 - openpyxl ==3.1.5 - - openssl ==3.4.0 + - openssl ==3.5.0 - orc ==2.0.3 - overrides ==7.7.0 - packaging ==24.2 @@ -478,7 +476,7 @@ requirements: - s2n ==1.5.10 # [linux] - s3fs ==2024.12.0 - scikit-learn ==1.6.0 - - scipy ==1.14.1 + - scipy ==1.15.2 - secretstorage ==3.3.3 # [linux] - send2trash ==1.8.3 - setuptools ==75.6.0 @@ -536,6 +534,7 @@ requirements: - tzdata ==2024b - ucrt ==10.0.22621.0 # [win] - ukkonen ==1.0.1 + - uncompresspy ==0.4.0 - unicodedata2 ==15.1.0 - uri-template ==1.3.0 - urllib3 ==2.3.0 diff --git a/pkg_defs/ska3-template/bin/ska_version b/pkg_defs/ska3-template/bin/ska_version index 97954dd6..96e194ad 100755 --- a/pkg_defs/ska3-template/bin/ska_version +++ b/pkg_defs/ska3-template/bin/ska_version @@ -13,10 +13,10 @@ $ ska_version --full core-2018.07.16:flight-2018.07.16:pinned-2018.07.16:template-0.1:sha-f272ef6 """ -import subprocess -import json -import hashlib import argparse +import hashlib +import json +import subprocess parser = argparse.ArgumentParser(description='Get Ska3 version tag') parser.add_argument('--full', @@ -33,7 +33,7 @@ if args.full: for pkg in pkgs if pkg['name'].startswith('ska3-')] else: ska3_pkgs = [pkg['version'] - for pkg in pkgs if pkg['name'] in ['ska3-flight', 'ska3-matlab']] + for pkg in pkgs if pkg['name'] in ['ska3-flight', 'ska3-matlab', 'ska3-aca']] # Get a list of all non-ska3-* metapackages conda pkgs and their versions # (not builds or channels)