From 3f1e5eb2ec4ff1ad78be0676adc111f05277cf92 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Thu, 19 Jan 2023 22:15:00 +0100 Subject: [PATCH] wtf is this shit --- .gitlab-ci.yml | 9 ++++----- Pipfile | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eef3f8f..dc0939d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ -image: python:3.11 +image: python:3.10 variables: + WINDOWS_PYTHON_PACKAGE_NAME: "python310" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIPENV_VENV_IN_PROJECT: 1 UPDATE_WINDOWS_DEPS: @@ -24,8 +25,6 @@ prepare: before_script: - pip install setuptools_scm>=6.2 script: - - PYTHON_VERSION=$(python --version | cut -d " " -f2) - - echo "PYTHON_VERSION=${PYTHON_VERSION}" | tee -a build.env - VERSION=$(python -m setuptools_scm) - echo "VERSION=${VERSION}" | tee -a build.env - echo "LINUX_AMD64_BINARY=fime_linux_amd64_${VERSION}" | tee -a build.env @@ -56,7 +55,7 @@ update_windows_deps: - prepare before_script: - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - - choco install python --version=$PYTHON_VERSION -y --no-progress + - choco install $WINDOWS_PYTHON_PACKAGE_NAME -y --no-progress - refreshenv - python --version - pip install pipenv @@ -118,7 +117,7 @@ package_windows: - if: $CI_COMMIT_TAG before_script: - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" - - choco install python --version=$PYTHON_VERSION -y --no-progress + - choco install $WINDOWS_PYTHON_PACKAGE_NAME -y --no-progress - refreshenv - python --version - pip install pipenv diff --git a/Pipfile b/Pipfile index 3352846..ffa461c 100644 --- a/Pipfile +++ b/Pipfile @@ -16,4 +16,4 @@ pyinstaller = "~=5.6" build = {version = "~=0.10", sys_platform = "== 'linux'" } [requires] -python_version = "3.11" +python_version = "3.10"