From 1dc91a246a890d6fe16af56b4a67eb5cfde2b8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:05:29 +0200
Subject: [PATCH 1/8] [chore] move the configuration files in a `conf` folder.

---
 .env.example => conf/.env.example               | 0
 config-example.yaml => conf/config-example.yaml | 0
 log_conf.yaml => conf/log_conf.yaml             | 0
 docs/configuration.md                           | 4 ++--
 docs/installation/getting-started.md            | 6 +++---
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename .env.example => conf/.env.example (100%)
 rename config-example.yaml => conf/config-example.yaml (100%)
 rename log_conf.yaml => conf/log_conf.yaml (100%)

diff --git a/.env.example b/conf/.env.example
similarity index 100%
rename from .env.example
rename to conf/.env.example
diff --git a/config-example.yaml b/conf/config-example.yaml
similarity index 100%
rename from config-example.yaml
rename to conf/config-example.yaml
diff --git a/log_conf.yaml b/conf/log_conf.yaml
similarity index 100%
rename from log_conf.yaml
rename to conf/log_conf.yaml
diff --git a/docs/configuration.md b/docs/configuration.md
index a8e4576..e6014f4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -7,7 +7,7 @@ There are actually two configuration files: one for the service and one for the
 The server configuration is done using environment variables. You can put them in a `.env` file at the root of the project.
 Here is a list of the useful variables, in the `.env` format:
 
-```{literalinclude} ../.env.example
+```{literalinclude} ../conf/.env.example
 ---
 caption: .env
 ---
@@ -48,7 +48,7 @@ Argos uses a YAML configuration file to define the websites to monitor and the c
 Here is a simple configuration file:
 
 
-```{literalinclude} ../config-example.yaml
+```{literalinclude} ../conf/config-example.yaml
 ---
 caption: config.yaml
 ---
diff --git a/docs/installation/getting-started.md b/docs/installation/getting-started.md
index a71ff65..63907d3 100644
--- a/docs/installation/getting-started.md
+++ b/docs/installation/getting-started.md
@@ -48,14 +48,14 @@ pip install -e .
 The quickest way to get started is to copy the `config-example.yaml` file and edit it:
 
 ```bash
-cp config-example.yaml config.yaml
+cp conf/config-example.yaml config.yaml
 ```
 
 <!--
 The quickest way to get started is to get the `config-example.yaml` file from our repository and edit it:
 
 ```bash
-wget https://framagit.org/framasoft/framaspace/argos/-/raw/main/config-example.yaml -O config.yaml
+wget https://framagit.org/framasoft/framaspace/argos/-/raw/main/conf/config-example.yaml -O config.yaml
 ```
 -->
 
@@ -65,7 +65,7 @@ You can read more about the configuration in the [configuration section](../conf
 
 Environment variables are used to configure the server. You can also put them in an `.env` file:
 
-```{literalinclude} ../../.env.example
+```{literalinclude} ../../conf/.env.example
 ---
 caption: .env
 ---

From 1d35ea22eaf65b3e0f9a986caa41859501f38701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:07:04 +0200
Subject: [PATCH 2/8] Add a new `argos version` command outputing the version.

---
 argos/__init__.py | 1 +
 argos/commands.py | 6 ++++++
 docs/cli.md       | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/argos/__init__.py b/argos/__init__.py
index e69de29..1cf6267 100644
--- a/argos/__init__.py
+++ b/argos/__init__.py
@@ -0,0 +1 @@
+VERSION = "0.1.0"
diff --git a/argos/commands.py b/argos/commands.py
index 6de52ce..c83e550 100644
--- a/argos/commands.py
+++ b/argos/commands.py
@@ -9,6 +9,7 @@ from alembic import command
 from alembic.config import Config
 
 from argos import logging
+from argos import VERSION
 from argos.agent import ArgosAgent
 
 
@@ -40,6 +41,11 @@ def server():
     pass
 
 
+@cli.command()
+def version():
+    click.echo(VERSION)
+
+
 @cli.command()
 @click.argument("server_url", envvar="ARGOS_AGENT_SERVER_URL")
 @click.argument("auth", envvar="ARGOS_AGENT_TOKEN")
diff --git a/docs/cli.md b/docs/cli.md
index 2e70714..472f8d6 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -26,8 +26,9 @@ Options:
   --help  Show this message and exit.
 
 Commands:
-  agent   Get and run tasks to the provided server.
+  agent    Get and run tasks to the provided server.
   server
+  version
 ```
 
 <!--[[[end]]]

From 5e757f186142e5098ddf46e787d27ec93fbfaad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:07:46 +0200
Subject: [PATCH 3/8] Split docstring on multiple lines to ease the reading.

---
 argos/commands.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/argos/commands.py b/argos/commands.py
index c83e550..ca87647 100644
--- a/argos/commands.py
+++ b/argos/commands.py
@@ -117,8 +117,11 @@ def validate_max_results(ctx, param, value):
 @click.option(
     "--max-lock-seconds",
     default=100,
-    help="The number of seconds after which a lock is considered stale, must be higher than 60 "
-    "(the checks have a timeout value of 60 seconds)",
+    help=(
+        "The number of seconds after which a lock is "
+        "considered stale, must be higher than 60 "
+        "(the checks have a timeout value of 60 seconds)"
+    ),
     callback=validate_max_lock_seconds,
 )
 @coroutine

From 5c4d8299bc1b911bcb3c81ffbd50c45286bc26a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:08:53 +0200
Subject: [PATCH 4/8] docs: rephrase some settings description

---
 docs/configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index e6014f4..38aeef4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -34,14 +34,14 @@ ARGOS_DATABASE_URL = "postgresql://argos:argos@localhost/argos"
 #### DB_POOL_SIZE
 #### DB_MAX_OVERFLOW
 
-These two help you configure the size of the pool, and the max overflow (until when do we accept a new connection ?) These are documented [in the SQLAlchemy docs in greater details](https://docs.sqlalchemy.org/en/20/core/pooling.html#sqlalchemy.pool.QueuePool.params.pool_size)
+You configure the size of the database pool of connection, and the max overflow (until when new connections are accepted ?) These are documented [in the SQLAlchemy docs in greater details](https://docs.sqlalchemy.org/en/20/core/pooling.html#sqlalchemy.pool.QueuePool.params.pool_size)
 
 ```bash
 DB_POOL_SIZE = 10
 DB_MAX_OVERFLOW = 20
 ```
 
-## Checks configuration
+## Argos "checks" configuration
 
 Argos uses a YAML configuration file to define the websites to monitor and the checks to run on these websites.
 

From 6baad623a21cf26d8bda0f53cdfe4b9bc47c908f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:11:36 +0200
Subject: [PATCH 5/8] docs: Update copyright information

---
 docs/conf.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 08bc07f..a6dffa6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -5,11 +5,12 @@
 
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
+import argos
 
 project = "Argos"
-copyright = "2023, Alexis Métaireau"
-author = "Alexis Métaireau"
-release = "0.0.1"
+copyright = "2023, Alexis Métaireau, Framasoft"
+author = "Alexis Métaireau, Framasoft"
+release = argos.VERSION
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

From 02892bec178d932c8fbeb9c11c1386c260ef4f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:15:59 +0200
Subject: [PATCH 6/8] build: document the release process

---
 docs/developer/release.md | 82 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 docs/developer/release.md

diff --git a/docs/developer/release.md b/docs/developer/release.md
new file mode 100644
index 0000000..da39138
--- /dev/null
+++ b/docs/developer/release.md
@@ -0,0 +1,82 @@
+# Releasing guide
+
+Once in a while, we release this package. Here is how.
+
+## Pre-requesites
+
+You need to be in a working environment, with the dev dependencies installed. You can check it's the case by typing:
+
+```bash
+pip install -e ".[dev]"
+```
+
+You'll need to get an account on [PyPI](https://pypi.org), where the packages will be uploaded.
+
+## The steps
+
+Here is the quick version. If you need more details, some parts are explained in more details in the next sections.
+
+```bash
+
+# Ensure the tests run correctly
+make test
+
+# Bump the version, according to semantic versionning
+hatch version minor # or `hatch version major``
+
+# Create a tag on the git repository and push it
+git tag "$(hatch version)" && git push
+
+# Build the project
+hatch build --clean
+
+# Upload the project to PyPI
+hatch publish
+```
+
+Aditionnaly, ensure it works well in a new environment.
+
+## Bumping the version number
+
+We follow semantic versionning conventions, and the version is specified in the `argos.__init__.py` file.
+`hatch` provide commands to help with this:
+
+```bash
+hatch version minor
+hatch version major
+```
+
+## Publishing
+
+`hatch` will ask you for some credentials. Don't provide them the full credentials to you account, but instead you can [create a (scoped) token](https://pypi.org/manage/account/token/).
+
+When asked for credentials, enter:
+
+- `__token__` as the login
+- the token as the value.
+
+## Verifying it worked
+
+Once published, you can test it works properly, by using pip, ideally in a new venv. Here's how:
+
+```bash
+python -m venv /tmp/argos
+source /tmp/argos/bin/activate
+pip install argos-monitoring
+argos version # should output the proper version
+```
+
+## Using the test server
+
+When running `hatch publish` the main PyPI instance will be used, which is not ideal for testing that it's doing what you want.
+
+If you're still experimenting, you can use the [Test PyPI](https://test.pypi.org) server.
+
+```bash
+# Publishing on test PyPI
+hatch build -r test
+
+# Installing from test PyPI
+pip install --index-url https://test.pypi.org/simple/ argos-monitoring
+
+```
\ No newline at end of file

From 01b5cf06de7c3047a20cab2afe40a479d3583357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Fri, 5 Apr 2024 15:17:00 +0200
Subject: [PATCH 7/8] build: move to `hatch` for packaging

---
 .gitignore     |  3 ++-
 pyproject.toml | 31 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index a68cdae..18d87f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ venv
 .env
 public
 *.swp
-config.yaml
\ No newline at end of file
+config.yaml
+dist
diff --git a/pyproject.toml b/pyproject.toml
index 6912c4d..92b065a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools", "setuptools-scm"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "argos-monitoring"
-version = "0.1.0"
+dynamic = ["version"]
 description = "Distributed supervision tool for HTTP."
 authors = [
   { name = "Alexis Métaireau", email = "alexis@notmyidea.org" },
@@ -12,10 +12,12 @@ authors = [
 ]
 readme = "README.md"
 classifiers = [
-    "Programming Language :: Python :: 3.11",
-    "Topic :: Internet :: WWW/HTTP",
-    "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-    "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Topic :: Internet :: WWW/HTTP",
+  "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+  "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
+  "Intended Audience :: System Administrators",
 ]
 
 dependencies = [
@@ -49,7 +51,7 @@ dev = [
   "respx>=0.20,<1",
   "ruff==0.1.5,<1",
   "sphinx-autobuild",
-  "build>=1.2.1"
+  "hatch==1.9.4",
 ]
 docs = [
   "cogapp", 
@@ -66,9 +68,20 @@ repository = "https://framagit.org/framasoft/framaspace/argos"
 "Funding" = "https://framasoft.org/en/#support"
 "Tracker" = "https://framagit.org/framasoft/framaspace/argos/-/issues"
 
-[tool.setuptools]
+[tool.hatch.build.targets.sdist]
+include = [
+  "/argos",
+  "/docs",
+  "/tests",
+]
+
+[tool.hatch.build.targets.wheel]
 packages = ["argos"]
 
+[tool.hatch.version]
+path = "argos/__init__.py"
+
+
 [project.scripts]
 argos = "argos.commands:cli"
 

From cf71b5d087f797c231382f97ae99dd851ebd318f Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Mon, 8 Apr 2024 08:36:29 +0200
Subject: [PATCH 8/8] =?UTF-8?q?=E2=9C=8F=20=E2=80=94=20Fix=20typo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/developer/release.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developer/release.md b/docs/developer/release.md
index da39138..ee6af92 100644
--- a/docs/developer/release.md
+++ b/docs/developer/release.md
@@ -22,7 +22,7 @@ Here is the quick version. If you need more details, some parts are explained in
 make test
 
 # Bump the version, according to semantic versionning
-hatch version minor # or `hatch version major``
+hatch version minor # or `hatch version major`
 
 # Create a tag on the git repository and push it
 git tag "$(hatch version)" && git push
@@ -79,4 +79,4 @@ hatch build -r test
 # Installing from test PyPI
 pip install --index-url https://test.pypi.org/simple/ argos-monitoring
 
-```
\ No newline at end of file
+```