Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions ci_environment.yml → ci_environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]'".
1 change: 1 addition & 0 deletions docs/changes/GOATS-668.new.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Replaced Astro Data Lab client: Implemented internal class to remove dependency conflicts.
1 change: 1 addition & 0 deletions docs/changes/GOATS-678.change.md
Original file line number Diff line number Diff line change
@@ -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.
13 changes: 4 additions & 9 deletions environment.yml → environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
10 changes: 5 additions & 5 deletions src/goats_tom/static/css/cores/halfmoon.goats.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down