Skip to content

Commit 90f82ca

Browse files
GOATS-1244: Upgrade Dragons to 4.2 , Tomtoolkit to 2.31.6 and resolve dependency issue (#602)
* GOATS-1244: Upgrade Dragons to 4.2 in GOATS -- resolve dependency issue * Update version to 26.4.0.dev1 and generate release notes. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 0d12d12 commit 90f82ca

6 files changed

Lines changed: 54 additions & 45 deletions

File tree

ci_environment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ channels:
2626
- nodefaults
2727

2828
dependencies:
29-
- dragons=4.1.0
29+
- dragons=4.2.0
3030
- pip>=25.1.1
3131
- python=3.12
3232
- redis-server>=7.4.0,<8

docs/changes/602.change.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgraded Dragons to 4.2 and TOMToolkit to 2.31.6, and resolved related dependency issues.

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ classifiers = [
2121
requires-python = ">=3.12"
2222
dependencies = [
2323
"apscheduler>=3.11.2",
24-
"astropy>=6.0,<7",
24+
"astropy>=7",
2525
"astroquery>=0.4.11",
2626
"channels-redis>=4.3.0,<5",
2727
"channels[daphne]>=4.0,<5",
@@ -37,7 +37,7 @@ dependencies = [
3737
"marshmallow-jsonapi>=0.24.0",
3838
"numpydoc>=1.9.0,<2",
3939
"tom-tns>=0.3.4",
40-
"tomtoolkit==2.29.0",
40+
"tomtoolkit>=2.31.6",
4141
]
4242
version = "26.4.0"
4343

@@ -154,7 +154,7 @@ docstring-code-format = true
154154
docstring-code-line-length = "dynamic"
155155

156156
[tool.uv.sources]
157-
dragons = { git = "https://github.com/GeminiDRSoftware/DRAGONS", tag = "v4.1.0" }
157+
dragons = { git = "https://github.com/GeminiDRSoftware/DRAGONS", tag = "v4.2.0" }
158158
fits-storage = { git = "https://github.com/GeminiDRSoftware/FitsStorage", tag = "v3.5.2" }
159159

160160
[tool.numpydoc_validation]

src/goats_setup/templates/goats_setup/settings.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ MIDDLEWARE = [
7777
"django.middleware.common.CommonMiddleware",
7878
"django.middleware.csrf.CsrfViewMiddleware",
7979
"django.contrib.auth.middleware.AuthenticationMiddleware",
80+
"django_htmx.middleware.HtmxMiddleware",
8081
"goats_tom.middleware.UserContextMiddleware",
8182
"goats_tom.middleware.TNSCredentialsMiddleware",
8283
"django.contrib.messages.middleware.MessageMiddleware",

src/goats_tom/static/js/gpp/program_observations_panel.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,6 @@ class ProgramObservationsPanel {
464464
options,
465465
getLabel = (o) => `${o.id} - ${o.name ?? o.title ?? ""}`
466466
) {
467-
// Limpia options y optgroups manteniendo el placeholder
468467
while (selectEl.options.length > 1) selectEl.remove(1);
469468
Array.from(selectEl.querySelectorAll("optgroup")).forEach(g => g.remove());
470469

0 commit comments

Comments
 (0)