Merge branch '52-remove-poetry' into 'main'

Remove Poetry

Closes #52

See merge request ndip/project-templates/nova-application-template!44

Author: evilkermit

.gitlab-ci.yml

@@ -23,10 +23,10 @@ test-cli-template:
   script:
     - mkdir reports
     - docker build -f dockerfiles/Dockerfile -t image .
-    - docker run -u `id -u`:`id -g` -w /src_cli image poetry run ruff check
-    - docker run -u `id -u`:`id -g` -w /src_cli image poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` -w /src_cli image poetry run mypy .
-    - docker run -u `id -u`:`id -g` -w /src_cli image poetry run pytest .
+    - docker run -u `id -u`:`id -g` -w /src_cli image pixi run ruff check
+    - docker run -u `id -u`:`id -g` -w /src_cli image pixi run ruff format --check
+    - docker run -u `id -u`:`id -g` -w /src_cli image pixi run mypy .
+    - docker run -u `id -u`:`id -g` -w /src_cli image pixi run pytest .
   tags:
     - rse-multi-builder
 
@@ -38,10 +38,10 @@ test-library-template:
   script:
     - mkdir reports
     - docker build -f dockerfiles/Dockerfile -t image .
-    - docker run -u `id -u`:`id -g` -w /src_library image poetry run ruff check
-    - docker run -u `id -u`:`id -g` -w /src_library image poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` -w /src_library image poetry run mypy .
-    - docker run -u `id -u`:`id -g` -w /src_library image poetry run pytest .
+    - docker run -u `id -u`:`id -g` -w /src_library image pixi run ruff check
+    - docker run -u `id -u`:`id -g` -w /src_library image pixi run ruff format --check
+    - docker run -u `id -u`:`id -g` -w /src_library image pixi run mypy .
+    - docker run -u `id -u`:`id -g` -w /src_library image pixi run pytest .
   tags:
     - rse-multi-builder
 
@@ -53,10 +53,10 @@ test-ndip-tool-template:
   script:
     - mkdir reports
     - docker build -f dockerfiles/Dockerfile -t image .
-    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image poetry run ruff check
-    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image poetry run mypy .
-    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image poetry run pytest .
+    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image pixi run ruff check
+    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image pixi run ruff format --check
+    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image pixi run mypy .
+    - docker run -u `id -u`:`id -g` -w /src_ndip_tool image pixi run pytest .
   tags:
     - rse-multi-builder
 
@@ -68,25 +68,10 @@ test-nova-application-template:
   script:
     - mkdir reports
     - docker build -f dockerfiles/Dockerfile -t image .
-    - docker run -u `id -u`:`id -g` -w /src_nova_application image poetry run ruff check
-    - docker run -u `id -u`:`id -g` -w /src_nova_application image poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` -w /src_nova_application image poetry run mypy .
-    - docker run -u `id -u`:`id -g` -w /src_nova_application image poetry run pytest .
-  tags:
-    - rse-multi-builder
-    
-test-nova-application-mantid-template:
-  stage: test
-  hooks:
-    pre_get_sources_script:
-    - 'test -d "${CI_PROJECT_DIR}" && sudo chown gitlab-runner -R "${CI_PROJECT_DIR}" ||:'
-  script:
-    - mkdir reports
-    - docker build -f dockerfiles/Dockerfile -t image .
-    - docker run -u `id -u`:`id -g` -w /src_nova_application_mantid image pixi run poetry run ruff check
-    - docker run -u `id -u`:`id -g` -w /src_nova_application_mantid image pixi run poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` -w /src_nova_application_mantid image pixi run poetry run mypy .
-    - docker run -u `id -u`:`id -g` -w /src_nova_application_mantid image pixi run poetry run pytest .
+    - docker run -u `id -u`:`id -g` -w /src_nova_application image pixi run ruff check
+    - docker run -u `id -u`:`id -g` -w /src_nova_application image pixi run ruff format --check
+    - docker run -u `id -u`:`id -g` -w /src_nova_application image pixi run mypy .
+    - docker run -u `id -u`:`id -g` -w /src_nova_application image pixi run pytest .
   tags:
     - rse-multi-builder
 
@@ -98,10 +83,10 @@ test-tutorial-template:
   script:
     - mkdir reports
     - docker build -f dockerfiles/Dockerfile -t image .
-    - docker run -u `id -u`:`id -g` -w /src_tutorial image poetry run ruff check
-    - docker run -u `id -u`:`id -g` -w /src_tutorial image poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` -w /src_tutorial image poetry run mypy .
-    - docker run -u `id -u`:`id -g` -w /src_tutorial image poetry run pytest .
+    - docker run -u `id -u`:`id -g` -w /src_tutorial image pixi run ruff check
+    - docker run -u `id -u`:`id -g` -w /src_tutorial image pixi run ruff format --check
+    - docker run -u `id -u`:`id -g` -w /src_tutorial image pixi run mypy .
+    - docker run -u `id -u`:`id -g` -w /src_tutorial image pixi run pytest .
   tags:
     - rse-multi-builder
 

copier.yml

@@ -44,11 +44,6 @@ tool_category:
         Small Angle Neutron Scattering: small-angle-neutron-scattering
         Triple-Axis Spectroscopy: spectroscopy
 
-use_mantid:
-    type: bool
-    help: Do you want to install Mantid for your project?
-    default: no
-
 # --- Nova Application Specific ---
 # Implicitly GUI if Nova Application is chosen.
 framework:
@@ -101,16 +96,16 @@ _message_after_copy: |
     2. Read "DEVELOPMENT.md" for development guidelines!
 
     3. Install project dependencies and setup pre-commit:
-       $ poetry install
-       $ pre-commit install
+       $ pixi install
+       $ pixi run pre-commit install
     {% else %}
     2. Review the generated files, including `minimal_config.yaml`.
        You may need to install dependencies like 'git', 'docker', 'bash', 'sed', 'grep', 'mktemp' manually if not already present.
     {% endif %}
 
     {% if application_type in ['Nova Application', 'NDIP Tool'] %}
     4. Initialize the Git repository:
-       $ poetry run init-repo
+       $ pixi run init-repo
 
        This script will show you the planned actions and ask for confirmation.
        It will NOT push automatically. After running, review the changes and push manually:
@@ -119,21 +114,21 @@ _message_after_copy: |
        $ git push --set-upstream origin main
 
     5. Test if the application runs:
-       $ poetry run app
+       $ pixi run app
        {% if application_type == 'Nova Application' %}
        If there are any problems with GUI dependencies (like PyQt/Trame) you might need to install/update system libraries.
        {% endif %}
 
     6. Deploy the tool XML to the Galaxy tools repository on the prototype branch:
-       $ poetry run deploy-prototype
+       $ pixi run deploy-prototype
 
        This script will also ask for confirmation before committing and pushing to the Galaxy tools repo.
        Ensure your Docker image is built and pushed first (see DEVELOPMENT.md or Dockerfile).
 
     7. Start coding! Remember to document your work (see DEVELOPMENT.md). Continue to update the version in pyproject.toml and run deploy-prototype as needed.
 
     8. When you're ready to make your tool available to users, deloy the tool XML to the Galaxy tools repository on the dev branch:
-       $ poetry run deploy-production
+       $ pixi run deploy-production
 
        This script will first create a new branch with your XML, then create a merge request from that branch to the dev branch.
        This will start the process of making your tool available to users on calvera. You should also review the MR and assign a reviewer.
@@ -147,7 +142,7 @@ _message_after_copy: |
        # Add remote and push if needed
 
     5. Test if the application runs:
-       $ poetry run app
+       $ pixi run app
 
     6. Start coding! Remember to document your work (see DEVELOPMENT.md).
 
@@ -159,19 +154,19 @@ _message_after_copy: |
        # Add remote and push if needed
 
     {% if publish_to_pypi %}
-    5. Configure PyPI publishing details in `pyproject.toml` and follow Poetry's publishing guide.
+    5. Configure PyPI publishing details in `pyproject.toml` and follow [Hatch's](https://hatch.pypa.io/latest/) publishing guide.
     {% endif %}
     {% if publish_docs %}
-    6. Configure Readthedocs integration (see `.readthedocs.yml` and `docs/conf.py`). Build docs locally with `poetry run sphinx-build docs docs/_build/html`.
+    6. Configure Readthedocs integration (see `.readthedocs.yml` and `docs/conf.py`). Build docs locally with `pixi run sphinx-build docs docs/_build/html`.
     {% endif %}
 
     7. Start developing your library! Remember to write tests and documentation (see DEVELOPMENT.md).
 
     {% elif application_type == 'Tutorial' %}
     4. Follow the specific instructions provided in the generated tutorial documentation (e.g., TUTORIAL.md or README.md) for next steps.
        This likely involves installing dependencies, running setup scripts, and testing the application.
-       $ poetry install
-       $ pre-commit install
+       $ pixi install
+       $ pixi run pre-commit install
        # (Check tutorial docs for specific init-repo/deploy-tool usage if applicable)
 
     {% elif application_type == 'Minimal' %}

dockerfiles/.cli-copier-answers.yml

@@ -3,4 +3,3 @@ application_type: Command-line tool
 project_name: CLI Tool
 python_package: cli-tool
 tool_category: generic
-use_mantid: false

dockerfiles/.library-copier-answers.yml

@@ -5,4 +5,3 @@ publish_docs: true
 publish_to_pypi: true
 python_package: library
 tool_category: generic
-use_mantid: false

dockerfiles/.minimal-copier-answers.yml

@@ -2,4 +2,3 @@
 application_type: Minimal
 project_name: minimal
 tool_category: generic
-use_mantid: false

dockerfiles/.ndip-tool-copier-answers.yml

@@ -3,4 +3,3 @@ application_type: NDIP Tool
 project_name: ndip_tool
 python_package: ndip_tool
 tool_category: generic
-use_mantid: false

dockerfiles/.nova-application-copier-answers.yml

@@ -5,4 +5,3 @@ multitabs: true
 project_name: nova_application
 python_package: nova_application
 tool_category: generic
-use_mantid: false

dockerfiles/.nova-application-mantid-copier-answers.yml

@@ -5,4 +5,3 @@ multitabs: true
 project_name: Tutorial
 python_package: tutorial
 tool_category: generic
-use_mantid: false

dockerfiles/.tutorial-copier-answers.yml

@@ -1,11 +1,7 @@
 FROM --platform=amd64 regproxy.ornl.gov/hub_proxy/python:3.10-slim
 
-ENV POETRY_CACHE_DIR=/poetry/.cache
-ENV POETRY_CONFIG_DIR=/poetry/.config
-ENV POETRY_HOME=/poetry
-
 RUN apt-get update && apt-get install -y curl git
-RUN pip install poetry copier
+RUN pip install copier
 
 RUN curl -fsSL https://pixi.sh/install.sh | sh
 ENV PATH="/root/.pixi/bin:${PATH}"
@@ -19,37 +15,24 @@ RUN copier copy --data-file /template/dockerfiles/.library-copier-answers.yml --
 RUN copier copy --data-file /template/dockerfiles/.minimal-copier-answers.yml --vcs-ref=HEAD template src_minimal
 RUN copier copy --data-file /template/dockerfiles/.ndip-tool-copier-answers.yml --vcs-ref=HEAD template src_ndip_tool
 RUN copier copy --data-file /template/dockerfiles/.nova-application-copier-answers.yml --vcs-ref=HEAD template src_nova_application
-RUN copier copy --data-file /template/dockerfiles/.nova-application-mantid-copier-answers.yml --vcs-ref=HEAD template src_nova_application_mantid
 RUN copier copy --data-file /template/dockerfiles/.tutorial-copier-answers.yml --vcs-ref=HEAD template src_tutorial
 
 
 WORKDIR /src_cli
-RUN poetry install
+RUN pixi install
 
 WORKDIR /src_library
-RUN poetry install
+RUN pixi install
 
 WORKDIR /src_ndip_tool
-RUN poetry install
+RUN pixi install
 
 WORKDIR /src_nova_application
-RUN poetry install
-
-WORKDIR /src_nova_application_mantid
 RUN pixi install
-RUN pixi run poetry install
 
 WORKDIR /src_tutorial
-RUN poetry install
-
-RUN poetry install
-RUN poetry build --format=wheel
-
-RUN chmod og+rwX /poetry
-RUN chmod og+rwX /src_cli
-RUN chmod og+rwX /src_library
-RUN chmod og+rwX /src_minimal
-RUN chmod og+rwX /src_ndip_tool
-RUN chmod og+rwX /src_nova_application
-RUN chmod og+rwX /src_nova_application_mantid
-RUN chmod og+rwX /src_tutorial
+RUN pixi install
+RUN pixi run hatch build
+
+RUN mkdir -p /.cache
+RUN chmod -R og+rwX /.cache /src_cli /src_library /src_minimal /src_ndip_tool /src_nova_application /src_tutorial