From 868e91b866601379447ca512c547fa9a3ba87154 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 28 Nov 2024 15:51:32 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=A8=20=E2=80=94=20Update=20hatch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 78b3c35..e14c17b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ dependencies = [ dev = [ "black==23.3.0", "djlint>=1.34.0", - "hatch==1.9.4", + "hatch==1.13.0", "ipdb>=0.13,<0.14", "ipython>=8.16,<9", "isort==5.11.5", From 7d21d8d271d48be78a1db534bc792e9e54201e9a Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 28 Nov 2024 16:13:30 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20-=20Fix=20database=20migrati?= =?UTF-8?q?ons=20without=20default=20values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ .../versions/127d74c770bb_add_recheck_delay.py | 9 ++++++++- .../versions/dcf73fa19fce_specify_check_method.py | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edfa8b9..cadb2e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +- ๐Ÿ› - Fix database migrations without default values + ## 0.6.0 Date: 2024-11-28 diff --git a/argos/server/migrations/versions/127d74c770bb_add_recheck_delay.py b/argos/server/migrations/versions/127d74c770bb_add_recheck_delay.py index 3605e8b..8701976 100644 --- a/argos/server/migrations/versions/127d74c770bb_add_recheck_delay.py +++ b/argos/server/migrations/versions/127d74c770bb_add_recheck_delay.py @@ -21,7 +21,14 @@ depends_on: Union[str, Sequence[str], None] = None def upgrade() -> None: with op.batch_alter_table("tasks", schema=None) as batch_op: batch_op.add_column(sa.Column("recheck_delay", sa.Float(), nullable=True)) - batch_op.add_column(sa.Column("already_retried", sa.Boolean(), nullable=False)) + batch_op.add_column( + sa.Column( + "already_retried", + sa.Boolean(), + nullable=False, + server_default=sa.sql.false(), + ) + ) def downgrade() -> None: diff --git a/argos/server/migrations/versions/dcf73fa19fce_specify_check_method.py b/argos/server/migrations/versions/dcf73fa19fce_specify_check_method.py index f218108..fdfa97c 100644 --- a/argos/server/migrations/versions/dcf73fa19fce_specify_check_method.py +++ b/argos/server/migrations/versions/dcf73fa19fce_specify_check_method.py @@ -36,6 +36,7 @@ def upgrade() -> None: name="method", ), nullable=False, + server_default="GET", ) ) From bb4db3ca8486cf1cd3c186ba2ca173bacd73228b Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 28 Nov 2024 16:16:53 +0100 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20-=20Fix=20domain=20status=20?= =?UTF-8?q?selector=E2=80=99s=20bug=20on=20page=20refresh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + argos/server/templates/domains.html | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cadb2e7..62433ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] - ๐Ÿ› - Fix database migrations without default values +- ๐Ÿ› - Fix domain status selectorโ€™s bug on page refresh ## 0.6.0 diff --git a/argos/server/templates/domains.html b/argos/server/templates/domains.html index e9d9d4b..ba542c6 100644 --- a/argos/server/templates/domains.html +++ b/argos/server/templates/domains.html @@ -71,7 +71,7 @@ {% endblock content %} From 1853b4fead1b0304d934a17af62d56d86d8aad2f Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 28 Nov 2024 16:27:39 +0100 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=92=9A=20=E2=80=94=20Fix=20tests=20in?= =?UTF-8?q?=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- tests/test_api.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e14c17b..0da4037 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "durations-nlp>=1.0.1,<2", "fastapi>=0.103,<0.104", "fastapi-login>=1.10.0,<2", - "httpx>=0.27.2,<1", + "httpx>=0.27.2,<0.28.0", "Jinja2>=3.0,<4", "jsonpointer>=3.0,<4", "passlib>=1.7.4,<2", diff --git a/tests/test_api.py b/tests/test_api.py index 21c87d1..9c9ab5d 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -60,6 +60,7 @@ def ssl_task(db): task = models.Task( url="https://exemple.com/", domain="https://exemple.com/", + method="GET", check="ssl-certificate-expiration", expected="on-check", frequency=1,