diff --git a/Jenkinsfile b/Jenkinsfile index e40c5ece0..a2b0845bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -671,7 +671,7 @@ pipeline { cleanWs( patterns: [ [pattern: 'venv/', type: 'INCLUDE'], - [pattern: '.tox', type: 'INCLUDE'], + [pattern: '.tox/', type: 'INCLUDE'], [pattern: '**/__pycache__/', type: 'INCLUDE'], ] ) @@ -717,7 +717,7 @@ pipeline { cleanWs( patterns: [ [pattern: 'venv/', type: 'INCLUDE'], - [pattern: '.tox', type: 'INCLUDE'], + [pattern: '.tox/', type: 'INCLUDE'], [pattern: '**/__pycache__/', type: 'INCLUDE'], ] ) diff --git a/ci/docker/python/linux/jenkins/Dockerfile b/ci/docker/python/linux/jenkins/Dockerfile deleted file mode 100644 index 24d3eb384..000000000 --- a/ci/docker/python/linux/jenkins/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM python:latest -RUN --mount=type=cache,target=/var/cache/apt \ - rm -f /etc/apt/apt.conf.d/docker-clean && \ - apt-get update && \ - apt-get install -yqq --no-install-recommends \ - libdbus-1-3 \ - libegl1 \ - libgl1-mesa-glx \ - libxkbcommon-x11-0 \ - && \ - rm -rf /var/lib/apt/lists/* diff --git a/ci/docker/python/windows/jenkins/Dockerfile b/ci/docker/python/windows/jenkins/Dockerfile deleted file mode 100644 index d3d0accaa..000000000 --- a/ci/docker/python/windows/jenkins/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# escape=` -ARG PYTHON_VERSION=3.7 -FROM python:${PYTHON_VERSION} as certsgen -RUN certutil -generateSSTFromWU roots.sst - -FROM python:${PYTHON_VERSION} as wheel_maker -ARG PIP_EXTRA_INDEX_URL -ARG PIP_TRUSTED_HOST -ARG PIP_INDEX_URL -COPY requirements.txt requirements-dev.txt ci/docker/python/shared/requirements-ci.txt ci/docker/python/shared/requirements-extra.txt c:/temp/ -COPY requirements/ c:/temp/requirements -RUN python -m pip install pip --upgrade ;` - pip install setuptools --upgrade ; ` - pip install wheel ;` - pip wheel --wheel-dir c:\wheels --no-cache-dir ` - -r c:\temp\requirements.txt ` - -r c:\temp\requirements-dev.txt ; ` - pip wheel --wheel-dir c:\wheels --no-cache-dir ` - -r c:\temp\requirements-ci.txt ; ` - pip wheel --wheel-dir c:\wheels --no-cache-dir ` - -r c:\temp\requirements-extra.txt - -FROM python:${PYTHON_VERSION} -COPY --from=certsgen c:/roots.sst roots.sst -RUN certutil -addstore -f root roots.sst ; ` - del roots.sst - - -COPY --from=wheel_maker c:\wheels\ c:\wheels\ - -COPY requirements.txt requirements-dev.txt ci/docker/python/shared/requirements-ci.txt c:/temp/ -COPY requirements/ c:/temp/requirements -RUN python -m pip install pip --upgrade ; ` - pip install setuptools --upgrade ; ` - pip install --no-index --find-links c:\wheels ` - -r c:\temp\requirements.txt ` - -r c:\temp\requirements-dev.txt ` - -r c:\temp\requirements-ci.txt -ENV PIP_FIND_LINKS=c:\wheels diff --git a/ci/docker/python/windows/tox/Dockerfile b/ci/docker/python/windows/tox/Dockerfile deleted file mode 100644 index c71b835e3..000000000 --- a/ci/docker/python/windows/tox/Dockerfile +++ /dev/null @@ -1,93 +0,0 @@ -# escape=` -ARG FROM_IMAGE=mcr.microsoft.com/dotnet/framework/sdk:4.8 - -ARG UV_CACHE_DIR=c:/users/containeradministrator/appdata/local/uv -ARG UV_EXTRA_INDEX_URL - -ARG PIPX_HOME=c:\pipx - -ARG PIP_DOWNLOAD_CACHE=c:/users/containeradministrator/appdata/local/pip - -ARG CHOCOLATEY_SOURCE=https://chocolatey.org/api/v2 -ARG ChocolateyEnvironmentDebug=false -ARG chocolateyVersion - - -FROM ${FROM_IMAGE} AS certsgen -RUN certutil -generateSSTFromWU roots.sst - -FROM ${FROM_IMAGE} AS BASE_BUILDER - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"] -ARG CHOCOLATEY_SOURCE -ARG ChocolateyEnvironmentDebug -ARG chocolateyVersion -COPY ci/docker/shared/chocolatey/install.ps1 c:/choco/install.ps1 -COPY ci/docker/shared/chocolatey/get_latest_chocolatey_url.ps1 c:/choco/get_latest_chocolatey_url.ps1 -RUN Set-ExecutionPolicy Bypass -Scope Process -Force; ` - $chocolateyDownloadUrl = c:/choco/get_latest_chocolatey_url.ps1 -packageRepo $env:CHOCOLATEY_SOURCE; ` - c:/choco/install.ps1 -ChocolateyDownloadUrl $chocolateyDownloadUrl;` - if( -not ([string]::IsNullOrEmpty($Env:CHOCOLATEY_SOURCE ))) ` - { ` - Write-Host "Adding $env:CHOCOLATEY_SOURCE to chocolatey sources" ; ` - choco source add -n=CHOCOLATEY_SOURCE --priority=1 -s=\"${env:CHOCOLATEY_SOURCE}\"; ` - }; ` - Write-Host "Disabling Showing Download Progress" ; ` - choco feature disable -n=showDownloadProgress ; ` - Remove-Item -Force -Recurse ${Env:TEMP}\* - -ADD ci/docker/shared/chocolatey/python.xml choco/python.config -RUN C:\ProgramData\chocolatey\bin\choco.exe install -y --stoponfirstfailure --no-progress --verbose choco/python.config ;` - Remove-Item C:\Users\ContainerAdministrator\AppData\Local\Temp\chocolatey -Recurse ; ` - refreshenv ; ` - Remove-Item -Force -Recurse ${Env:TEMP}\* ; ` - py --list ;` - py -3.8 --version ; ` - py -3.9 --version ; ` - py -3.10 --version ; ` - py -3.11 --version ; ` - Write-Host "Installing Python with Chocolatey - Done" - -ADD ci/docker/shared/chocolatey/packages.xml choco/packages.config -RUN C:\ProgramData\chocolatey\bin\choco.exe sources ; ` - C:\ProgramData\chocolatey\bin\choco.exe install -y --stoponfirstfailure --no-progress --verbose choco/packages.config ;` - Remove-Item C:\Users\ContainerAdministrator\AppData\Local\Temp\chocolatey -Recurse ; ` - refreshenv ; ` - Remove-Item -Force -Recurse ${Env:TEMP}\* ; ` - if (!(Test-Path 'C:\Program Files\Git\cmd\git.exe')) ` - { ` - throw 'git.exe not found' ; ` - }; ` - Write-Host "Finished install packages with Chocolatey" - -COPY --from=certsgen c:/roots.sst roots.sst -RUN certutil -addstore -f root roots.sst ; ` - del roots.sst - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"] - -ARG PIP_EXTRA_INDEX_URL -ARG PIP_INDEX_URL - -COPY requirements-dev.txt c:/python_requirments/ -COPY requirements/ c:/python_requirments/requirements -ARG UV_EXTRA_INDEX_URL -ENV UV_INDEX_STRATEGY=unsafe-best-match -RUN python -m pip install pip --upgrade --no-cache-dir ; pip install uv --no-cache-dir; uv pip install --no-cache-dir --system -r c:/python_requirments/requirements-dev.txt tox-uv - -ARG PIPX_HOME -ENV PIPX_HOME=${PIPX_HOME} -ENV PIPX_BIN_DIR=${PIPX_HOME}\bin - - -RUN py -3 -m uv pip install --system --no-cache-dir pipx ; ` - py -3 -m pipx ensurepath - -ARG UV_CACHE_DIR -ARG PIP_DOWNLOAD_CACHE - -ENV UV_CACHE_DIR=${UV_CACHE_DIR} -ENV PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE} - -WORKDIR C:/src -CMD tox --workdir ${Env:TEMP}\tox\ -vv --recreate -p=auto