From 670d44931a36a1f58bdf8352df816c240e799b60 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 29 Jan 2026 15:57:12 +0100 Subject: [PATCH 1/6] repackage with modern PyPA standards --- eessi/__init__.py | 0 pyproject.toml | 24 ++++++++++++++++++++++++ setup.py | 22 ---------------------- src/eessi/__init__.py | 1 + {eessi => src/eessi}/cli/check.py | 0 {eessi => src/eessi}/cli/init.py | 0 {eessi => src/eessi}/cli/main.py | 0 {eessi => src/eessi}/cli/shell.py | 0 8 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 eessi/__init__.py create mode 100644 pyproject.toml delete mode 100644 setup.py create mode 100644 src/eessi/__init__.py rename {eessi => src/eessi}/cli/check.py (100%) rename {eessi => src/eessi}/cli/init.py (100%) rename {eessi => src/eessi}/cli/main.py (100%) rename {eessi => src/eessi}/cli/shell.py (100%) diff --git a/eessi/__init__.py b/eessi/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..8c92677 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,24 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "eessi" +description = "Command line tool (CLI) to manage and launch your EESSI environment" +readme = "README.md" +authors = [ + {name = "Kenneth Hoste", email = "kenneth.hoste@ugent.be"}, +] +license = {file = "LICENSE"} +dynamic = ["version"] +requires-python = ">=3.9" +dependencies = [ + "typer>=0.21", + "rich>=14.0", +] + +[project.scripts] +mysnapshots = "eessi.cli.main:app" + +[tool.setuptools.dynamic] +version = {attr = "eessi.__version__"} diff --git a/setup.py b/setup.py deleted file mode 100644 index 9ef45b3..0000000 --- a/setup.py +++ /dev/null @@ -1,22 +0,0 @@ -from setuptools import setup - -with open('README.md') as fp: - long_descr = fp.read() - -setup( - name="eessi", - version="0.0.3", - description="User-friendly command line interface to EESSI - https://eessi.io", - long_description=long_descr, - long_description_content_type='text/markdown', - url="https://github.com/EESSI/eessi-cli", - install_requires=[ - "typer>=0.21", - "rich>=14.0", - ], - packages=["eessi/cli"], - entry_points={ - "console_scripts": ["eessi=eessi.cli.main:app"], - }, - python_requires=">=3.9", -) diff --git a/src/eessi/__init__.py b/src/eessi/__init__.py new file mode 100644 index 0000000..3b93d0b --- /dev/null +++ b/src/eessi/__init__.py @@ -0,0 +1 @@ +__version__ = "0.0.2" diff --git a/eessi/cli/check.py b/src/eessi/cli/check.py similarity index 100% rename from eessi/cli/check.py rename to src/eessi/cli/check.py diff --git a/eessi/cli/init.py b/src/eessi/cli/init.py similarity index 100% rename from eessi/cli/init.py rename to src/eessi/cli/init.py diff --git a/eessi/cli/main.py b/src/eessi/cli/main.py similarity index 100% rename from eessi/cli/main.py rename to src/eessi/cli/main.py diff --git a/eessi/cli/shell.py b/src/eessi/cli/shell.py similarity index 100% rename from eessi/cli/shell.py rename to src/eessi/cli/shell.py From 8e82d73331cabb564ebb72b73b704dcf02e8fb0c Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 29 Jan 2026 16:00:11 +0100 Subject: [PATCH 2/6] version bump to 0.0.4 --- src/eessi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eessi/__init__.py b/src/eessi/__init__.py index 3b93d0b..81f0fde 100644 --- a/src/eessi/__init__.py +++ b/src/eessi/__init__.py @@ -1 +1 @@ -__version__ = "0.0.2" +__version__ = "0.0.4" From c0a024311798b01226bdb8fcffd7216ed78772e4 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 29 Jan 2026 16:04:30 +0100 Subject: [PATCH 3/6] fix entrypoint name --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8c92677..c4ebadb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ ] [project.scripts] -mysnapshots = "eessi.cli.main:app" +eessi = "eessi.cli.main:app" [tool.setuptools.dynamic] version = {attr = "eessi.__version__"} From f3ec3392f0af9c7b2d70565aeef1b323ff5c906c Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 29 Jan 2026 16:06:24 +0100 Subject: [PATCH 4/6] remove email from authors list --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c4ebadb..63a207e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "eessi" description = "Command line tool (CLI) to manage and launch your EESSI environment" readme = "README.md" authors = [ - {name = "Kenneth Hoste", email = "kenneth.hoste@ugent.be"}, + {name = "Kenneth Hoste"}, ] license = {file = "LICENSE"} dynamic = ["version"] From 1d41980f0153c1d3b179c70a229d3af8e18636df Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 29 Jan 2026 16:07:54 +0100 Subject: [PATCH 5/6] udpate package description --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 63a207e..8036dec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "eessi" -description = "Command line tool (CLI) to manage and launch your EESSI environment" +description = "User-friendly command line interface to EESSI - https://eessi.io" readme = "README.md" authors = [ {name = "Kenneth Hoste"}, From 269cf3ace178e6c18eefef70986bd25639fe15c4 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 29 Jan 2026 16:11:24 +0100 Subject: [PATCH 6/6] update Python environment in CI --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d4d138b..86dbe61 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,10 +5,10 @@ permissions: contents: read # to fetch code (actions/checkout) jobs: ubuntu-minimal: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: - python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: set up Python