From 9dc7584af3ad64dac44a977c89f6ce84dce81560 Mon Sep 17 00:00:00 2001 From: Dantali0n <info@dantalion.nl> Date: Fri, 7 Jul 2023 08:28:55 +0200 Subject: [PATCH] Use recommend setup for building wheels on ci --- .gitlab-ci.yml | 10 ++++++++++ {{cookiecutter.project_slug}}/.gitlab-ci.yml | 15 ++++++++++++++- {{cookiecutter.project_slug}}/pyproject.toml | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2b35ef..0e31a2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,16 @@ default: - python -m pip install --upgrade pip - pip install --upgrade tox twine +# override package files before script +package_files: + before_script: + - pip install cookiecutter + - !reference [default, before_script] + artifacts: + expire_in: 1w + paths: + - my_awesome_app/dist/* + # Override artifact directories run_unit_tests_coverage: artifacts: diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 90f3556..6101bbb 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -79,12 +79,25 @@ run_unit_tests_coverage: package_files: stage: package + image: python:3.8 + # make a docker daemon available for cibuildwheel to use +# services: +# - name: docker:dind +# entrypoint: [ "env", "-u", "DOCKER_HOST" ] +# command: [ "dockerd-entrypoint.sh" ] +# variables: +# DOCKER_HOST: tcp://docker:2375/ +# DOCKER_DRIVER: overlay2 +# # See https://github.com/docker-library/docker/pull/166 +# DOCKER_TLS_CERTDIR: "" artifacts: expire_in: 1w paths: - dist/* script: - - tox -e build-ci-linux + - curl -sSL https://get.docker.com/ | sh + - python -m pip install cibuildwheel==2.13.1 cookiecutter + - cibuildwheel --platform linux --output-dir dist package_docs: stage: package diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml index 05f2bca..19e2b25 100644 --- a/{{cookiecutter.project_slug}}/pyproject.toml +++ b/{{cookiecutter.project_slug}}/pyproject.toml @@ -11,7 +11,7 @@ name = "{{cookiecutter.project_slug}}" dynamic = ["version"] description="{{cookiecutter.description}}" readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" classifiers = [ "Development Status :: 4 - Beta", "License :: OSI Approved :: MIT License", -- GitLab