From fda8751073b7b6f932a484f5701a8ab230c2c193 Mon Sep 17 00:00:00 2001 From: Dan Avner Date: Wed, 4 Jun 2025 16:54:26 -0700 Subject: [PATCH] GOATS-678: Update to DRAGONS 4.0.0 and Python 3.12. - Bumped DRAGONS to latest stable release. - Raised required Python version to 3.12. - Updated other dependencies for compatibility. --- README.md | 2 +- ci_environment.yml => ci_environment.yaml | 8 ++++---- docs/changes/GOATS-668.new.md | 1 + docs/changes/GOATS-678.change.md | 1 + environment.yml => environment.yaml | 13 ++++-------- pyproject.toml | 20 +++++++++---------- .../static/css/cores/halfmoon.goats.css | 10 +++++----- 7 files changed, 26 insertions(+), 29 deletions(-) rename ci_environment.yml => ci_environment.yaml (90%) create mode 100644 docs/changes/GOATS-668.new.md create mode 100644 docs/changes/GOATS-678.change.md rename environment.yml => environment.yaml (69%) diff --git a/README.md b/README.md index 821b2436..b5be05c5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Its objective is to simplify the TDAMM workflow for users by serving as a one-st For detailed information on installation, configuration, and usage, visit the **[GOATS documentation](https://goats.readthedocs.io/en/latest/)**. ## System Requirements -- Python 3.10 or higher +- Python 3.12 or higher - Intel Anaconda or Miniconda (works on M1 architecture) >= 4.12 ### Workaround for ARM (M1/M2) Mac users: diff --git a/ci_environment.yml b/ci_environment.yaml similarity index 90% rename from ci_environment.yml rename to ci_environment.yaml index cfa87eb8..325c5ebe 100644 --- a/ci_environment.yml +++ b/ci_environment.yaml @@ -20,10 +20,10 @@ channels: - nodefaults dependencies: - - dragons=3.2.3 - - pip - - python>=3.10 - - redis-server + - dragons=4.0.0 + - pip=25.1.1 + - python=3.12 + - redis-server=7.2.8 # For development, use clone the GOATS repo and "pip install -e ." or # for tests, install with "pip install -e '.[test]'". diff --git a/docs/changes/GOATS-668.new.md b/docs/changes/GOATS-668.new.md new file mode 100644 index 00000000..cc84e1f7 --- /dev/null +++ b/docs/changes/GOATS-668.new.md @@ -0,0 +1 @@ +Replaced Astro Data Lab client: Implemented internal class to remove dependency conflicts. \ No newline at end of file diff --git a/docs/changes/GOATS-678.change.md b/docs/changes/GOATS-678.change.md new file mode 100644 index 00000000..1064be9e --- /dev/null +++ b/docs/changes/GOATS-678.change.md @@ -0,0 +1 @@ +Updated DRAGONS and dependencies: Updated to DRAGONS 4.0.0 and raised the required Python version to 3.12. Also updated other dependencies for compatibility. \ No newline at end of file diff --git a/environment.yml b/environment.yaml similarity index 69% rename from environment.yml rename to environment.yaml index c2779925..ae6d855e 100644 --- a/environment.yml +++ b/environment.yaml @@ -20,14 +20,9 @@ channels: - nodefaults dependencies: - - dragons=3.2.3 - - pip - - python>=3.10 - - redis-server - - # For development, use clone the GOATS repo and "pip install -e ." or - # for tests, install with "pip install -e '.[test]'". - - # Uncomment the below lines to install from GitHub (requires repo access). + - dragons=4.0.0 + - pip=25.1.1 + - python=3.12 + - redis-server=7.2.8 - pip: - git+https://github.com/gemini-hlsw/goats.git@25.3.0 \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index ca44cb3a..10b2339a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,22 +17,22 @@ classifiers = [ "Programming Language :: Python :: 3", "Topic :: Scientific/Engineering :: Astronomy", ] -requires-python = ">=3.10.0" +requires-python = ">=3.12" dependencies = [ "astropy>=6.0,<7", "astroquery==0.4.10", - "tomtoolkit==2.23.1", - "click>=8.1.7,<9", - "django-cors-headers>=4.3.0,<5", + "tomtoolkit==2.24.5", + "click>=8.2.1,<9", + "django-cors-headers>=4.7.0,<5", "django-cryptography>=1.1,<2", "channels[daphne]>=4.0,<5", - "channels_redis>=4.0.0,<5", + "channels_redis>=4.2.1,<5", "django>=4.2.2,<5", - "djangorestframework>=3.14.0,<4", - "dramatiq[redis, watch]>=1.17.0", - "django-dramatiq>=0.11.6", - "dramatiq-abort>=1.1.0", - "numpydoc>=1.7.0,<2", + "djangorestframework>=3.16.0,<4", + "dramatiq[redis, watch]>=1.18.0,<2", + "django-dramatiq>=0.13.0", + "dramatiq-abort>=1.2.1", + "numpydoc>=1.8.0,<2", "marshmallow>=3.26.1,<4", "marshmallow-jsonapi>=0.24.0", ] diff --git a/src/goats_tom/static/css/cores/halfmoon.goats.css b/src/goats_tom/static/css/cores/halfmoon.goats.css index 7f57720f..a27d6320 100644 --- a/src/goats_tom/static/css/cores/halfmoon.goats.css +++ b/src/goats_tom/static/css/cores/halfmoon.goats.css @@ -217,23 +217,23 @@ footer { } .shadow-xs { - box-shadow: 0 1px 3px hsla(0deg 0% 0% / 20%); + box-shadow: 0 1px 3px hsl(0deg 0% 0% / 20%); } .shadow-sm { - box-shadow: 0 4px 6px hsla(0deg 0% 0% / 20%); + box-shadow: 0 4px 6px hsl(0deg 0% 0% / 20%); } .shadow-md { - box-shadow: 0 5px 15px hsla(0deg 0% 0% / 20%); + box-shadow: 0 5px 15px hsl(0deg 0% 0% / 20%); } .shadow-lg { - box-shadow: 0 10px 24px hsla(0deg 0% 0% / 20%); + box-shadow: 0 10px 24px hsl(0deg 0% 0% / 20%); } .shadow-xl { - box-shadow: 0 15px 35px hsla(0deg 0% 0% / 20%); + box-shadow: 0 15px 35px hsl(0deg 0% 0% / 20%); } .download-tasks-container {