diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 2f1c50415458b12c59414b04dcff51371f17aa70..a08ac42cee44750882e09355b11c49321f1f5673 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -94,20 +94,12 @@ package_files: stage: package tags: - dind - variables: - DOCKER_TLS_CERTDIR: "/certs" artifacts: expire_in: 1w paths: - dist/* script: - - unset DOCKER_TLS_VERIFY - - env | grep DOCKER - source scripts/setup-docker-host.sh - - env | grep DOCKER - - echo $PATH - - which git - - which python - tox -e build-ci-linux package_docs: diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml index acc4388bd4dda930cfe7ab6a5cf22d30608326f7..418fa711927f94906ce8531054a65989ebb43f51 100644 --- a/{{cookiecutter.project_slug}}/pyproject.toml +++ b/{{cookiecutter.project_slug}}/pyproject.toml @@ -35,14 +35,6 @@ write_to = "src/{{cookiecutter.project_slug}}/_version.py" [tool.cibuildwheel] skip = "*-win32 *-manylinux_i686 pp*" build-verbosity = 1 -manylinux-x86_64-image = "manylinux2014" -manylinux-i686-image = "manylinux2014" - -# Before Python 3.10, manylinux2010 is the most compatible -[[tool.cibuildwheel.overrides]] -select = "cp3?-*" -manylinux-x86_64-image = "manylinux2010" -manylinux-i686-image = "manylinux2010" [tool.cibuildwheel.macos] archs = ["x86_64", "universal2", "arm64"] @@ -132,9 +124,8 @@ commands = [["python", "-m", "build"]] [tool.tox.env.build-ci-linux] package = "wheel" deps = ["-r{toxinidir}/build-requirements.txt"] -allowlist_externals = ["docker", "which", "{work_dir}/.tox/bin/python", "rm"] +allowlist_externals = ["docker"] pass_env = ["DOCKER_HOST", "DOCKER_TLS_VERIFY", "DOCKER_CERT_PATH"] commands = [ - ["rm", "-rf", "build"], ["python", "-m", "cibuildwheel", "--platform", "linux", "--output-dir", "dist"] ]