From 889e90add754fce20e3ab08327533ba4f93fffa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Tue, 17 Sep 2024 17:12:09 -0700 Subject: [PATCH] Improve the CI (#134) --- .github/workflows/check.yaml | 51 ++++++++++++++++++++++ .github/workflows/check.yml | 78 ---------------------------------- .github/workflows/release.yaml | 48 +++++++++++++++++++++ .github/workflows/release.yml | 32 -------------- README.md | 4 +- pyproject.toml | 2 +- tox.ini | 41 ++++++++---------- 7 files changed, 119 insertions(+), 137 deletions(-) create mode 100644 .github/workflows/check.yaml delete mode 100644 .github/workflows/check.yml create mode 100644 .github/workflows/release.yaml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml new file mode 100644 index 0000000..87e4c54 --- /dev/null +++ b/.github/workflows/check.yaml @@ -0,0 +1,51 @@ +name: check +on: + workflow_dispatch: + push: + branches: ["main"] + tags-ignore: ["**"] + pull_request: + schedule: + - cron: "0 8 * * *" + +concurrency: + group: check-${{ github.ref }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + env: + - "3.13" + - "3.12" + - "3.11" + - "3.10" + - "3.9" + - "3.8" + - type + - dev + - pkg_meta + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install the latest version of uv + uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + cache-dependency-glob: "pyproject.toml" + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: Install tox + run: uv tool install --python-preference only-managed --python 3.13 tox --with tox-uv + - name: Install Python + if: startsWith(matrix.env, '3.') && matrix.env != '3.13' + run: uv python install --python-preference only-managed ${{ matrix.env }} + - name: Setup test suite + run: tox run -vv --notest --skip-missing-interpreters false -e ${{ matrix.env }} + - name: Run test suite + run: tox run --skip-pkg-install -e ${{ matrix.env }} + env: + PYTEST_ADDOPTS: "-vv --durations=5" diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml deleted file mode 100644 index 1d808a1..0000000 --- a/.github/workflows/check.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: check -on: - workflow_dispatch: - push: - branches: ["main"] - tags-ignore: ["**"] - pull_request: - schedule: - - cron: "0 8 * * *" - -concurrency: - group: check-${{ github.ref }} - cancel-in-progress: true - -jobs: - test: - name: test ${{ matrix.py }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - py: - - "3.13" - - "3.12" - - "3.11" - - "3.10" - - "3.9" - - "3.8" - steps: - - name: Install the latest version of uv - uses: astral-sh/setup-uv@v3 - with: - enable-cache: true - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: setup python for tox - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - name: install tox - run: uv pip install tox tox-uv --system - - uses: actions/checkout@v4 - - name: setup python for test ${{ matrix.py }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.py }} - allow-prereleases: true - - name: setup test suite - run: tox run -vv --notest --skip-missing-interpreters false -e ${{ matrix.py }} - - name: run test suite - run: tox run --skip-pkg-install -e ${{ matrix.py }} - - check: - name: tox env ${{ matrix.tox_env }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - tox_env: - - type - - dev - - readme - steps: - - name: Install the latest version of uv - uses: astral-sh/setup-uv@v3 - with: - enable-cache: true - github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v4 - - name: setup Python 3.12 - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - name: install tox - run: uv pip install tox tox-uv --system - - name: Setup test suite - run: tox -vv --notest --skip-missing-interpreters false -e ${{ matrix.tox_env }} - - name: Run test suite - run: tox --skip-pkg-install -e ${{ matrix.tox_env }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..ec23ded --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,48 @@ +name: Release to PyPI +on: + push: + tags: ["*"] + +env: + dists-artifact-name: python-package-distributions + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install the latest version of uv + uses: astral-sh/setup-uv@v3 + with: + enable-cache: true + cache-dependency-glob: "pyproject.toml" + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: Build package + run: uv build --python 3.13 --python-preference only-managed --sdist --wheel . --out-dir dist + - name: Store the distribution packages + uses: actions/upload-artifact@v4 + with: + name: ${{ env.dists-artifact-name }} + path: dist/* + + release: + needs: + - build + runs-on: ubuntu-latest + environment: + name: release + url: https://pypi.org/project/devpi-process/${{ github.ref_name }} + permissions: + id-token: write + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: ${{ env.dists-artifact-name }} + path: dist/ + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@v1.10.1 + with: + attestations: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 1fde28d..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Release to PyPI -on: - push: - tags: ["*"] - -jobs: - release: - runs-on: ubuntu-latest - environment: - name: release - url: https://pypi.org/p/devpi-process - permissions: - id-token: write - steps: - - name: Setup python to build package - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - name: Install the latest version of uv - uses: astral-sh/setup-uv@v3 - with: - enable-cache: true - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Install build - run: uv pip install build[uv] --system - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Build package - run: pyproject-build --installer uv --sdist --wheel . --outdir dist - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@v1.10.1 diff --git a/README.md b/README.md index 64d1b54..5abf3e7 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,7 @@ [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/devpi-process?style=flat-square)](https://pypi.org/project/devpi-process) [![Downloads](https://static.pepy.tech/badge/devpi-process/month)](https://pepy.tech/project/devpi-process) [![PyPI - License](https://img.shields.io/pypi/l/devpi-process?style=flat-square)](https://opensource.org/licenses/MIT) -[![check](https://github.com/tox-dev/devpi-process/workflows/check/badge.svg)](https://github.com/tox-dev/devpi-process/actions?query=workflow%3Acheck) -[![Code style: -black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black) +[![check](https://github.com/tox-dev/devpi-process/actions/workflows/check.yaml/badge.svg)](https://github.com/tox-dev/devpi-process/actions/workflows/check.yaml) Allows you to create [devpi](https://devpi.net/docs/devpi/devpi/stable/+d/index.html) server process with indexes, and upload artifacts to that programmatically. diff --git a/pyproject.toml b/pyproject.toml index 4d8e905..9bc9391 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ dependencies = [ "devpi-server>=6.12.1", "typing-extensions>=4.12.2; python_version<'3.11'", ] -optional-dependencies.test = [ +optional-dependencies.testing = [ "covdefaults>=2.3", "httpx>=0.27.2", "pytest>=8.3.2", diff --git a/tox.ini b/tox.ini index 259d08c..80d1399 100644 --- a/tox.ini +++ b/tox.ini @@ -11,35 +11,33 @@ env_list = 3.9 3.8 type - readme + pkg_meta skip_missing_interpreters = true [testenv] -description = run the unit tests with pytest under {basepython} +description = run the unit tests with pytest under {base_python} package = wheel wheel_build_env = .pkg extras = - test + testing +pass_env = + DIFF_AGAINST + PYTEST_* set_env = - COVERAGE_FILE = {toxworkdir}/.coverage.{envname} - COVERAGE_PROCESS_START = {toxinidir}/pyproject.toml - _COVERAGE_SRC = {envsitepackagesdir}/devpi_process + COVERAGE_FILE = {work_dir}/.coverage.{env_name} commands = - pytest {tty:--color=yes} {posargs: \ - --junitxml {toxworkdir}{/}junit.{envname}.xml --cov {envsitepackagesdir}{/}devpi_process \ - --cov {toxinidir}{/}tests --cov-fail-under=100 \ + python -m pytest {tty:--color=yes} {posargs: \ + --cov {env_site_packages_dir}{/}devpi_process --cov {tox_root}{/}tests \ --cov-config=pyproject.toml --no-cov-on-fail --cov-report term-missing:skip-covered --cov-context=test \ - --cov-report html:{envtmpdir}{/}htmlcov --cov-report xml:{toxworkdir}{/}coverage.{envname}.xml \ + --cov-report html:{env_tmp_dir}{/}htmlcov --cov-report xml:{work_dir}{/}coverage.{env_name}.xml \ + --junitxml {work_dir}{/}junit.{env_name}.xml \ tests} [testenv:fix] -description = run static analysis and style check using flake8 +description = format the code base to adhere to our styles, and complain about what we cannot do automatically skip_install = true deps = - pre-commit-uv>=4.1 -pass_env = - HOMEPATH - PROGRAMDATA + pre-commit-uv>=4.1.1 commands = pre-commit run --all-files --show-diff-on-failure @@ -51,24 +49,21 @@ commands = mypy src mypy tests -[testenv:readme] +[testenv:pkg_meta] description = check that the long description is valid skip_install = true deps = - build[uv]>=1.2.2 check-wheel-contents>=0.6 twine>=5.1.1 + uv>=0.4.10 commands = - pyproject-build --installer uv --outdir {envtmpdir} --sdist --wheel . - twine check {envtmpdir}{/}* - check-wheel-contents --no-config {envtmpdir} + uv build --sdist --wheel --out-dir {env_tmp_dir} . + twine check {env_tmp_dir}{/}* + check-wheel-contents --no-config {env_tmp_dir} [testenv:dev] description = generate a DEV environment package = editable -extras = - docs - test commands = uv pip tree python -c 'import sys; print(sys.executable)'