diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9fb8cb..c008cb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,11 @@ lint: before_script: - ./cicd/install-project-deps.sh script: - - pipenv run python setup.py check -mrs - - pipenv run black --check . - - pipenv run flake8 - - pipenv run mypy sublime tests/**/*.py - - pipenv run cicd/custom_style_check.py + - poetry run python setup.py check -mrs + - poetry run black --check . + - poetry run flake8 + - poetry run mypy sublime tests/**/*.py + - poetry run cicd/custom_style_check.py test: stage: test @@ -37,7 +37,7 @@ test: - Xvfb :119 -screen 0 1024x768x16 & - export DISPLAY=:119 script: - - pipenv run ./cicd/pytest.sh + - poetry run ./cicd/pytest.sh artifacts: paths: - htmlcov @@ -47,7 +47,7 @@ build: before_script: - ./cicd/install-project-deps.sh script: - - pipenv run python setup.py sdist + - poetry run python setup.py sdist artifacts: paths: - dist/* @@ -115,7 +115,7 @@ publish_release: before_script: - ./cicd/install-project-deps.sh script: - - pipenv run ./cicd/publish-gitlab-release.sh + - poetry run ./cicd/publish-gitlab-release.sh # Scheduled Jobs # ============================================================================= diff --git a/cicd/install-project-deps.sh b/cicd/install-project-deps.sh index d73f5c3..164ad21 100755 --- a/cicd/install-project-deps.sh +++ b/cicd/install-project-deps.sh @@ -3,5 +3,9 @@ export PYENV_ROOT="${HOME}/.pyenv" export PATH="${PYENV_ROOT}/bin:$PATH" eval "$(pyenv init -)" -export PIPENV_VENV_IN_PROJECT=1 -pipenv install --dev +pip3 install poetry + +mkdir -p ~/.config/pypoetry/ +echo "[virtualenvs]" > ~/.config/pypoetry/config.toml +echo "in-project = true" >> ~/.config/pypoetry/config.toml +poetry install --dev diff --git a/cicd/pages-build.sh b/cicd/pages-build.sh index 8c9b00b..a063b88 100755 --- a/cicd/pages-build.sh +++ b/cicd/pages-build.sh @@ -3,7 +3,7 @@ set -xe pushd docs -pipenv run make html +poetry run make html popd mv docs/_build/html public diff --git a/cicd/python-build/Dockerfile b/cicd/python-build/Dockerfile index 875517f..71fbe83 100644 --- a/cicd/python-build/Dockerfile +++ b/cicd/python-build/Dockerfile @@ -40,7 +40,7 @@ RUN apt update && \ RUN cd /usr/local/src && \ curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash -RUN pip3 install pipenv +RUN pip3 install poetry # Install the correct Python version with pyenv COPY install-python.sh /tmp/install-python.sh