From 72ff2b1ebeeb11e3f5362f2128bf4889c70de68f Mon Sep 17 00:00:00 2001 From: Zurdi Date: Wed, 13 Dec 2023 17:59:46 +0100 Subject: [PATCH] removed npm suffix from poetry command --- .github/workflows/pytest.yml | 3 +-- DEVELOPER-SETUP.md | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 734afdffd..0fd6520cf 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -45,8 +45,7 @@ jobs: - name: Install poetry run: | - pipx install --suffix _npm git+https://github.com/radoering/poetry.git@non-package-mode - ln -s /opt/pipx_bin/poetry_npm /opt/pipx_bin/poetry + pipx install git+https://github.com/radoering/poetry.git@non-package-mode - name: Set up Python 3.10 uses: actions/setup-python@v4 diff --git a/DEVELOPER-SETUP.md b/DEVELOPER-SETUP.md index f4aa1a345..f8f9ada94 100644 --- a/DEVELOPER-SETUP.md +++ b/DEVELOPER-SETUP.md @@ -35,7 +35,7 @@ https://python-poetry.org/docs/#installing-with-the-official-installer **_WARNING:_** Until poetry 1.8.0 version is released, poetry needs to be installed with the new non-package-mode feature branch: ```sh -pipx install --suffix _npm git+https://github.com/radoering/poetry.git@non-package-mode +pipx install git+https://github.com/radoering/poetry.git@non-package-mode ``` More info: https://github.com/python-poetry/poetry/pull/8650 @@ -44,9 +44,9 @@ More info: https://github.com/python-poetry/poetry/pull/8650 Then creat the virtual environment ```sh -# Fix disable parallel installation stuck: $> poetry_npm config experimental.new-installer false +# Fix disable parallel installation stuck: $> poetry config experimental.new-installer false # Fix Loading macOS/linux stuck: $> export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring -poetry_npm install --sync +poetry install --sync ``` ### - Spin up mariadb in docker @@ -61,7 +61,7 @@ docker-compose up -d ```sh cd backend -poetry_npm run python3 main.py +poetry run python3 main.py ``` @@ -69,7 +69,7 @@ poetry_npm run python3 main.py ```sh cd backend -poetry_npm run python3 worker.py +poetry run python3 worker.py ``` ## Setting up the frontend @@ -110,5 +110,5 @@ docker exec -i mariadb mysql -u root -p < backend/romm_test/setup ```sh cd backend # path or test file can be passed as argument to test only a subset -poetry_npm run pytest [path/file] +poetry run pytest [path/file] ```