Merge pull request #19 from nova-model/17-remove-poetry

Remove Poetry

Author: evilkermit

.github/workflows/build-test.yml

@@ -34,16 +34,16 @@ jobs:
           load: true
           target: source
       - name: Run ruff check
-        run: docker run --rm ${{ steps.build.outputs.imageid }} poetry run ruff check
+        run: docker run --rm ${{ steps.build.outputs.imageid }} ruff check
       - name: Run format check
-        run: docker run --rm ${{ steps.build.outputs.imageid }} poetry run ruff format --check
+        run: docker run --rm ${{ steps.build.outputs.imageid }} ruff format --check
       - name: Run mypy
-        run: docker run --rm ${{ steps.build.outputs.imageid }} poetry run mypy .
+        run: docker run --rm ${{ steps.build.outputs.imageid }} mypy .
       - name: Run Prettier
         run: docker run --rm -w /opt/run/vue ${{ steps.build.outputs.imageid }} pnpm exec prettier --check .
       - name: Run eslint
         run: docker run --rm -w /opt/run/vue ${{ steps.build.outputs.imageid }} pnpm exec eslint .
       - name: Unit tests
-        run: docker run --rm ${{ steps.build.outputs.imageid }} poetry run pytest
+        run: docker run --rm ${{ steps.build.outputs.imageid }} pytest
       - name: Run coverage
-        run: docker run --rm ${{ steps.build.outputs.imageid }} sh -c "poetry run coverage run && poetry run coverage report"
+        run: docker run --rm ${{ steps.build.outputs.imageid }} sh -c "coverage run && coverage report"

.gitlab-ci.yml

@@ -23,9 +23,9 @@ lint-check:
   stage: lint
   script:
     - docker build -f dockerfiles/Dockerfile --target source -t image .
-    - docker run -u `id -u`:`id -g` image poetry run ruff check
-    - docker run -u `id -u`:`id -g` image poetry run ruff format --check
-    - docker run -u `id -u`:`id -g` image poetry run mypy .
+    - docker run -u `id -u`:`id -g` image ruff check
+    - docker run -u `id -u`:`id -g` image ruff format --check
+    - docker run -u `id -u`:`id -g` image mypy .
     - docker run -u `id -u`:`id -g` -w /opt/run/vue image pnpm exec prettier --check .
     - docker run -u `id -u`:`id -g` -w /opt/run/vue image pnpm exec eslint .
     - docker tag image ${IMAGE_NAME}:src-${CI_COMMIT_SHA}
@@ -38,9 +38,9 @@ unit-tests:
   script:
     - mkdir reports
     - docker pull ${IMAGE_NAME}:src-${CI_COMMIT_SHA}
-    - docker run -u `id -u`:`id -g` -v `pwd`/reports:/opt/run/django/reports ${IMAGE_NAME}:src-${CI_COMMIT_SHA} poetry run coverage run
-    - docker run -u `id -u`:`id -g` -v `pwd`/reports:/opt/run/django/reports ${IMAGE_NAME}:src-${CI_COMMIT_SHA} poetry run coverage report
-    - docker run -u `id -u`:`id -g` -v `pwd`/reports:/opt/run/django/reports ${IMAGE_NAME}:src-${CI_COMMIT_SHA} poetry run coverage xml -o reports/coverage.xml
+    - docker run -u `id -u`:`id -g` -v `pwd`/reports:/opt/run/django/reports ${IMAGE_NAME}:src-${CI_COMMIT_SHA} coverage run
+    - docker run -u `id -u`:`id -g` -v `pwd`/reports:/opt/run/django/reports ${IMAGE_NAME}:src-${CI_COMMIT_SHA} coverage report
+    - docker run -u `id -u`:`id -g` -v `pwd`/reports:/opt/run/django/reports ${IMAGE_NAME}:src-${CI_COMMIT_SHA} coverage xml -o reports/coverage.xml
     - sed -i "s:<source>/src:<source>${CI_BUILDS_DIR}/${CI_PROJECT_PATH}:" reports/coverage.xml
 
   coverage: '/TOTAL.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
@@ -77,17 +77,3 @@ build-image:
       fi
   tags:
     - rse-multi-builder
-# package-build:
-#   stage: package
-#   script:
-#     - >
-#       docker run
-#       -u `id -u`:`id -g`
-#       ${IMAGE_NAME}:src-${CI_COMMIT_SHA}
-#       bash -c "
-#       poetry config repositories.gitlab_repo ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi &&
-#       poetry publish -u gitlab-ci-token -p ${CI_JOB_TOKEN} -r gitlab_repo
-#       "
-#   when: manual
-#   tags:
-#     - rse-multi-builder

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
     hooks:
       - id: mypy
         name: mypy
-        entry: poetry run mypy src/launcher_app
+        entry: pixi run mypy src/launcher_app
         language: system
         types: [python]
         verbose: true

README.md

@@ -5,12 +5,12 @@ way for users to launch interactive tools without going through Calvera.
 
 ## Install dependencies
 
-You will need to install [Poetry](https://python-poetry.org/) and [pnpm](https://pnpm.io/). After doing so, you can run
+You will need to install [Pixi](https://pixi.sh/latest/) and [pnpm](https://pnpm.io/). After doing so, you can run
 the following commands to build the source code.
 
 ```bash
-poetry install
-poetry run ./manage.py migrate
+pixi install
+pixi run ./manage.py migrate
 ```
 
 ```bash
@@ -35,13 +35,12 @@ pnpm run dev --host 0.0.0.0 --port 5173
 After that to start the application (from the root directory):
 
 ```bash
-poetry run ./manage.py runserver_plus --insecure 0.0.0.0:8080
+pixi run ./manage.py runserver_plus --insecure 0.0.0.0:8080
 ```
 
 ## Develop
 
-Run `poetry env info  --path` to see the path to Poetry environment. It can then be used
-to configure your IDE to select the correct Python interpreter.
+Pixi will create a `.pixi` folder containing a virtual environment for this project. Please configure your IDE to use this environment.
 
 ## Docker
 

dockerfiles/Dockerfile

@@ -3,9 +3,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # make sure image can run as non-root user
 ENV PNPM_HOME=/pnpm
-ENV POETRY_CACHE_DIR=/poetry/.cache
-ENV POETRY_CONFIG_DIR=/poetry/.config
-ENV POETRY_HOME=/poetry
 
 RUN apt update && apt upgrade -y && apt install -y \
     curl \
@@ -16,10 +13,6 @@ RUN add-apt-repository ppa:deadsnakes/ppa -y
 RUN apt update && apt install -y \
     python3.10
 
-# Install Poetry
-RUN curl -fsSL https://install.python-poetry.org | python3.10 -
-ENV PATH="$PATH:$POETRY_HOME/bin"
-
 # Install Node.js LTS & pnpm
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt install -y nodejs
@@ -30,7 +23,12 @@ ENV PATH="$PATH:$PNPM_HOME"
 # Setup Django
 ADD ./ /opt/run/django
 WORKDIR /opt/run/django
-RUN poetry install
+
+RUN curl -fsSL https://pixi.sh/install.sh | sh
+ENV PATH="/root/.pixi/bin:${PATH}"
+RUN pixi install
+SHELL [ "pixi", "run", "--manifest-path", "/opt/run/django" ]
+ENTRYPOINT [ "pixi", "run", "--manifest-path", "/opt/run/django" ]
 
 # Setup Vue.js
 ADD src/vue /opt/run/vue
@@ -39,7 +37,6 @@ RUN pnpm install
 
 WORKDIR /opt/run/django
 RUN chmod og+rwX -R /pnpm
-RUN chmod og+rwX -R /poetry
 RUN chmod og+rwX -R /opt/run/django
 RUN chmod og+rwX -R /opt/run/vue
 
@@ -48,7 +45,7 @@ FROM source AS run
 
 # Install dependencies only used in production builds
 WORKDIR /opt/run/django
-RUN poetry run pip install gunicorn uvicorn-worker
+RUN pixi add --pypi gunicorn uvicorn-worker
 
 # Create static client build
 WORKDIR /opt/run/vue