[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: /, .github/workflows/
commit: 603c5d1ad86e2f98443c4650f4cf600ffd8ff8e0 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jul 19 10:49:59 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jul 19 11:04:18 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=603c5d1a ci: test on py3.13 Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 4 pyproject.toml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 328e7ca3..cf0b5031 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,6 +17,10 @@ jobs: deps: [newest-deps] experimental: [false] include: + - os: ubuntu-latest +python-version: '3.13-dev' +deps: newest-deps +experimental: true - os: ubuntu-latest python-version: '3.11' deps: minimal-deps diff --git a/pyproject.toml b/pyproject.toml index 7b737347..0b7e20fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,6 +36,8 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Software Development :: Quality Assurance", ] dynamic = ["version"]
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 6f86366ceb63922a87f8d810d5f816fab9254071 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jul 19 10:39:16 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jul 19 10:39:16 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=6f86366c ci: fix failure on macos pre-step Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 122a04ce..328e7ca3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: # experimental targets generally lack lxml wheels - name: Install libxml2 and libxslt development packages - if: ${{ matrix.experimental }} + if: ${{ matrix.experimental && matrix.os != 'macos-latest' }} run: sudo apt install libxml2-dev libxslt-dev python3-dev # macos needs newer bash
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 469710da16ab10e4a7a554637b871050f132e3ff Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 18 11:46:12 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 18 11:46:24 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=469710da ci: testing on macos is experimental Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d5feff4..122a04ce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: - os: macos-latest python-version: '3.11' deps: newest-deps -experimental: false +experimental: true fail-fast: false steps:
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/, /
commit: a6413488d74735f9175bda9f6ed009a760b5c24f Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 23 19:55:06 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 23 19:55:06 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=a6413488 use flit instead of setuptools Since we don't need to build tree-sitter-bash lib, we became pure python package, where flit is much better suited for this task. This now also matches other packages under pkgcore stack. This simplifies a lot the release process, as we don't need to build the lib anymore using cibuildwheel. Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 75 ++--- MANIFEST.in | 14 py_build.py | 147 ++ pyproject.toml| 59 + setup.py | 145 - 5 files changed, 181 insertions(+), 259 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b229664f..b8be4db0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,8 +7,15 @@ on: workflow_dispatch: jobs: - build-sdist: + build-and-deploy: runs-on: ubuntu-latest +environment: release + +permissions: + id-token: write # Used to authenticate to PyPI via OIDC + + contents: write # Used to authenticate github release publish + steps: - name: Checkout code uses: actions/checkout@v4 @@ -34,70 +41,26 @@ jobs: make man make sdist +- name: Build wheel + run: make wheel + - name: Output dist file info run: | +sha512sum dist/* tar -ztf dist/*.tar.gz | sort -- name: Upload sdist artifact - uses: actions/upload-artifact@v4 - with: -name: dist-sdist -path: dist/*.tar.gz - - - build-wheel: -runs-on: ubuntu-latest -strategy: - fail-fast: false - matrix: -arch: [x86_64, aarch64] - -steps: -- name: Checkout code - uses: actions/checkout@v4 - -- name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: -platforms: ${{matrix.arch}} - -- name: Build wheels - uses: joerick/cibuildwheel@v2.16.5 - with: -output-dir: dist - env: -CIBW_ARCHS_LINUX: ${{matrix.arch}} - -- name: Upload wheel artifacts - uses: actions/upload-artifact@v4 - with: -name: dist-wheel-${{matrix.arch}} -path: dist/*.whl - - - deploy: -if: startsWith(github.ref, 'refs/tags/') -needs: ["build-sdist", "build-wheel"] -runs-on: ubuntu-latest -environment: release - -permissions: - id-token: write # Used to authenticate to PyPI via OIDC - - contents: write # Used to authenticate github release publish - -steps: -- uses: actions/download-artifact@v4 +- uses: actions/upload-artifact@v4 with: -pattern: dist-* -path: dist -merge-multiple: true +name: results +path: dist/* -- name: Publish a Python distribution to PyPI +- name: publish uses: pypa/gh-action-pypi-publish@release/v1 + if: startsWith(github.ref, 'refs/tags/') - name: Create GitHub release uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: files: dist/*.tar.gz fail_on_unmatched_files: true @@ -105,7 +68,7 @@ jobs: build-and-push-docker-image: if: startsWith(github.ref, 'refs/tags/') -needs: ["deploy"] +needs: ["build-and-deploy"] runs-on: ubuntu-latest environment: release diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 15fbcc7a.. --- a/MANIFEST.in +++ /dev/null @@ -1,14 +0,0 @@ -include LICENSE *.py *.rst -include tox.ini pyproject.toml .coveragerc .pylintrc -recursive-include bin * -recursive-include contrib * -recursive-include data * -recursive-include doc * -recursive-exclude doc/generated * -recursive-exclude doc/man/pkgcheck * -recursive-include requirements * -recursive-include src * -recursive-include testdata * -recursive-include tests * -recursive-include tree-sitter-bash * -global-exclude *.so *.pyc *.pyo __pycache__ diff --git a/py_build.py b/py_build.py new file mode 100644 index ..5199fdd1 --- /dev/null +++ b/py_build.py @@ -0,0 +1,147 @@ +import sys +from collections import defaultdict +from functools import partial +from contextlib import contextmanager +from pathlib import Path +from textwrap import dedent + +from flit_core import buildapi + + +@contextmanager +def sys_path(): +orig_path = sys.path[:] +sys.path.insert(0, str(Path.cwd() / "src")) +try: +yield +finally: +sys.path = orig_path + + +def write_verinfo(cleanup_files): +from snakeoil.version import get_git_version + +
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: aaae90b95b2a265d699a40df26a5143954517cad Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 1 20:16:59 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 1 20:16:59 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=aaae90b9 ci: fix release pipeline Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e2699eb5..b229664f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,7 +87,7 @@ jobs: contents: write # Used to authenticate github release publish steps: -- uses: actions/download-artifact@v3 +- uses: actions/download-artifact@v4 with: pattern: dist-* path: dist
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: f063b825747027304db4b250526ebce7ce0b4ed9 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 1 20:03:39 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 1 20:03:39 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=f063b825 ci: fix release pipeline Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79da0a62..e2699eb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Upload sdist artifact uses: actions/upload-artifact@v4 with: -name: dist +name: dist-sdist path: dist/*.tar.gz @@ -62,7 +62,7 @@ jobs: platforms: ${{matrix.arch}} - name: Build wheels - uses: joerick/cibuildwheel@v2.16.3 + uses: joerick/cibuildwheel@v2.16.5 with: output-dir: dist env: @@ -71,7 +71,7 @@ jobs: - name: Upload wheel artifacts uses: actions/upload-artifact@v4 with: -name: dist +name: dist-wheel-${{matrix.arch}} path: dist/*.whl @@ -89,7 +89,7 @@ jobs: steps: - uses: actions/download-artifact@v3 with: -name: dist +pattern: dist-* path: dist merge-multiple: true
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: acba2c476e81d1c8f00d9ea45c4e8d2d9234aa7a Author: Sam James gentoo org> AuthorDate: Fri Feb 16 23:44:55 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 1 19:19:39 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=acba2c47 Revert "ci: test py3.13" This reverts commit 9cb39d40ef6334961bc247edc722d893abce9985. Temproarily disable Python 3.13 in CI as lxml isn't building anymore, even though it did until about last week... Signed-off-by: Sam James gentoo.org> Closes: https://github.com/pkgcore/pkgcheck/pull/665 Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 5 - 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cf09c3e3..cde5dbd7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,11 +18,6 @@ jobs: experimental: [false] tree-sitter-bash: [bundled] include: - - os: ubuntu-latest -python-version: '3.13-dev' -deps: newest-deps -experimental: true -tree-sitter-bash: bundled - os: ubuntu-latest python-version: '3.11' deps: minimal-deps
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: c37b6bb37df37547902bf8d1425768db87d84e89 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 26 20:08:05 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 26 20:08:05 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=c37b6bb3 ci: bump dependencies Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/doc.yml | 8 .github/workflows/release.yml | 15 --- .github/workflows/test.yml| 16 +++- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index fa7d2df2..2ca20e41 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' @@ -38,7 +38,7 @@ jobs: touch build/sphinx/html/.nojekyll - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: build/sphinx/html @@ -53,4 +53,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment -uses: actions/deploy-pages@v1 +uses: actions/deploy-pages@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1de7e0c..79da0a62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" @@ -39,7 +39,7 @@ jobs: tar -ztf dist/*.tar.gz | sort - name: Upload sdist artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist path: dist/*.tar.gz @@ -54,22 +54,22 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: ${{matrix.arch}} - name: Build wheels - uses: joerick/cibuildwheel@v2.16.2 + uses: joerick/cibuildwheel@v2.16.3 with: output-dir: dist env: CIBW_ARCHS_LINUX: ${{matrix.arch}} - name: Upload wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dist path: dist/*.whl @@ -91,6 +91,7 @@ jobs: with: name: dist path: dist +merge-multiple: true - name: Publish a Python distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 227444a5..cf09c3e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 # experimental targets generally lack lxml wheels - name: Install libxml2 and libxslt development packages @@ -86,7 +86,7 @@ jobs: popd - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' @@ -100,8 +100,7 @@ jobs: - name: Test with pytest env: PY_COLORS: 1 # forcibly enable pytest colors - run: | -pytest --cov --cov-report=term --cov-report=xml -v + run: pytest --cov --cov-report=term --cov-report=xml -v - name: Check whether bundled tree-sitter-bash was built if: ${{ matrix.os == 'ubuntu-latest' && matrix.tree-sitter-bash }} @@ -123,10 +122,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' @@ -136,12 +135,11 @@ jobs: pip install . pylint - name: Run linting tools - run: | -pylint --exit-zero src/pkgcheck + run: pylint --exit-zero src/pkgcheck format: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: psf/black@stable
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: /, .github/workflows/
commit: a29f96f39bdba2c3747e6f52d3a413cb9fe8865f Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 26 08:26:58 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 26 08:26:58 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=a29f96f3 release: drop ppc64le & s390x Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 2 +- pyproject.toml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 769d7606..a1de7e0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: strategy: fail-fast: false matrix: -arch: [x86_64, aarch64, ppc64le, s390x] +arch: [x86_64, aarch64] steps: - name: Checkout code diff --git a/pyproject.toml b/pyproject.toml index 29a19feb..0327d01f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ name = "pkgcheck" description = "pkgcore-based QA utility for ebuild repos" readme = "README.rst" license = {file = "LICENSE"} -requires-python = "~=3.9" +requires-python = "~=3.10" # alphabetical by surname. authors = [ {name = "Michał Górny", email = "mgo...@gentoo.org"},
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: /, .github/workflows/
commit: 39fe80bdea376594a06ee646a68bf52a130fdced Author: Arthur Zamarin gentoo org> AuthorDate: Thu Jan 25 18:04:12 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Jan 25 19:15:29 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=39fe80bd pyproject.toml: fix build in cibuildwheel Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 2 +- pyproject.toml| 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5053cbed..769d7606 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: platforms: ${{matrix.arch}} - name: Build wheels - uses: joerick/cibuildwheel@v2.11.2 + uses: joerick/cibuildwheel@v2.16.2 with: output-dir: dist env: diff --git a/pyproject.toml b/pyproject.toml index c8f59a16..29a19feb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,9 +115,9 @@ select = "*-manylinux*" before-all = [ # "apt-get update", # "apt-get install -y git libxml2-dev libxslt-dev", - "yum update -y", - "yum install -y git libxslt-devel libxml2-devel", + "yum update -y --nogpgcheck", + "yum install -y --nogpgcheck git libxslt-devel libxml2-devel", - "curl -L \"https://github.com/robxu9/bash-static/releases/download/5.1.016-1.2.3/bash-linux-$(uname -m)\" -o /usr/local/bin/bash", + "curl -L \"https://github.com/robxu9/bash-static/releases/download/5.2.015-1.2.3-2/bash-linux-$(uname -m)\" -o /usr/local/bin/bash", "chmod +x /usr/local/bin/bash", ]
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 3a8e0aacc88d0c6288d96abff84378f2ceb24a31 Author: Brian Harring gmail com> AuthorDate: Fri Jan 19 06:30:52 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Jan 23 19:57:59 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=3a8e0aac CI/CD: only run doc deploy if its the main snakeoil repo. Signed-off-by: Brian Harring gmail.com> .github/workflows/doc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index e77f2700..fa7d2df2 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -43,6 +43,7 @@ jobs: path: build/sphinx/html deploy: +if: github.repository == 'pkgcore/pkgcheck' environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }}
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 9cb39d40ef6334961bc247edc722d893abce9985 Author: Sam James gentoo org> AuthorDate: Fri Jan 19 04:35:14 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 19 09:34:48 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=9cb39d40 ci: test py3.13 Signed-off-by: Sam James gentoo.org> Closes: https://github.com/pkgcore/pkgcheck/pull/567 Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 5 + 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6824482..227444a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,11 @@ jobs: experimental: [false] tree-sitter-bash: [bundled] include: + - os: ubuntu-latest +python-version: '3.13-dev' +deps: newest-deps +experimental: true +tree-sitter-bash: bundled - os: ubuntu-latest python-version: '3.11' deps: minimal-deps
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/, /
commit: b4715359f053fc497ccde436572492c9545ea9a2 Author: Sam James gentoo org> AuthorDate: Mon Mar 20 04:08:32 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 19 09:34:45 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=b4715359 ci: add py3.12 Signed-off-by: Sam James gentoo.org> Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 7 +-- tox.ini| 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66fa6279..f6824482 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,16 +13,11 @@ jobs: strategy: matrix: os: [ubuntu-latest] -python-version: ['3.10', '3.11'] +python-version: ['3.10', '3.11', '3.12'] deps: [newest-deps] experimental: [false] tree-sitter-bash: [bundled] include: - # - os: ubuntu-latest - # python-version: '3.11.0-beta - 3.11' - # deps: newest-deps - # experimental: true - # tree-sitter-bash: bundled - os: ubuntu-latest python-version: '3.11' deps: minimal-deps diff --git a/tox.ini b/tox.ini index 52283ec9..ec97ccc5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py3{9,10,11} +envlist = py3{9,10,11,12} skip_missing_interpreters = True isolated_build = True
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 3f013bb7c89c101fe341342934dce289bf1e03aa Author: Arthur Zamarin gentoo org> AuthorDate: Sun Jan 14 19:47:13 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Jan 14 19:47:46 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=3f013bb7 ci: drop python 3.9, use 3.11 as default Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/doc.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml| 8 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index b8a0101e..e77f2700 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -21,10 +21,10 @@ jobs: - name: Checkout code uses: actions/checkout@v3 -- name: Set up Python 3.10 +- name: Set up Python 3.11 uses: actions/setup-python@v4 with: -python-version: '3.10' +python-version: '3.11' - name: Install dependencies run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7911a55..5053cbed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,10 @@ jobs: - name: Checkout code uses: actions/checkout@v3 -- name: Set up Python 3.10 +- name: Set up Python 3.11 uses: actions/setup-python@v4 with: -python-version: "3.10" +python-version: "3.11" - name: Install dependencies run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e19da6b0..66fa6279 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] -python-version: ['3.9', '3.10', '3.11'] +python-version: ['3.10', '3.11'] deps: [newest-deps] experimental: [false] tree-sitter-bash: [bundled] @@ -24,17 +24,17 @@ jobs: # experimental: true # tree-sitter-bash: bundled - os: ubuntu-latest -python-version: '3.10' +python-version: '3.11' deps: minimal-deps experimental: false tree-sitter-bash: bundled - os: ubuntu-latest -python-version: '3.10' +python-version: '3.11' deps: newest-deps experimental: false tree-sitter-bash: system - os: macos-latest -python-version: '3.10' +python-version: '3.11' deps: newest-deps experimental: false tree-sitter-bash: bundled
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/, /
commit: 62448c9034420e277c76d703416d3260d70b6963 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jan 13 19:35:21 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jan 13 19:35:21 2024 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=62448c90 Dockerfile: introduce pkgcheck docker on release Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 43 +++ Dockerfile| 6 ++ 2 files changed, 49 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9e1c6fc..f7911a55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,3 +101,46 @@ jobs: files: dist/*.tar.gz fail_on_unmatched_files: true draft: true + + build-and-push-docker-image: +if: startsWith(github.ref, 'refs/tags/') +needs: ["deploy"] +runs-on: ubuntu-latest +environment: release + +permissions: + contents: read + packages: write + +steps: + - name: Checkout code +uses: actions/checkout@v4 + + - name: Scrape build info +run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV + + - name: Log in to the Container registry +uses: docker/login-action@v3 +with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Docker meta +id: meta +uses: docker/metadata-action@v5 +with: + images: ghcr.io/pkgcore/pkgcheck + tags: | +type=semver,pattern={{version}} +type=sha + + - name: Build and push +uses: docker/build-push-action@v5 +with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | +PKGCHECK_VERSION=${{ env.RELEASE_VERSION }} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index ..42c3b37d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM python:3-slim +ARG PKGCHECK_VERSION + +RUN apt-get update && apt-get install -y git && \ +rm -rf /var/lib/apt/lists/ /var/cache/apt && \ +pip install pkgcheck==${PKGCHECK_VERSION} setuptools
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 9e55f8818a881b13fdd111dc8e0640db7123fbfa Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jun 23 05:22:36 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jun 23 05:22:36 2023 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=9e55f881 ci: add pytest-github-actions-annotate-failures for test Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 312a3452..0b37058e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -95,7 +95,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip -pip install ".[test]" +pip install ".[test]" pytest-github-actions-annotate-failures - name: Test with pytest env:
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: b9fd639ecb4117d0d8098e49d34ef102de842969 Author: Arthur Zamarin gentoo org> AuthorDate: Wed May 17 16:15:10 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed May 17 16:15:10 2023 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=b9fd639e ci: use new PyPI OIDC publish Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6de38945..f9e1c6fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,6 +79,13 @@ jobs: if: startsWith(github.ref, 'refs/tags/') needs: ["build-sdist", "build-wheel"] runs-on: ubuntu-latest +environment: release + +permissions: + id-token: write # Used to authenticate to PyPI via OIDC + + contents: write # Used to authenticate github release publish + steps: - uses: actions/download-artifact@v3 with: @@ -87,12 +94,10 @@ jobs: - name: Publish a Python distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: -password: ${{ secrets.PYPI_API_TOKEN }} -print_hash: true - name: Create GitHub release uses: softprops/action-gh-release@v1 with: files: dist/*.tar.gz fail_on_unmatched_files: true +draft: true
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: f8ff0304fcb78d31777dc4e22b9a63d15fce29c1 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Dec 29 17:52:29 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Dec 29 17:52:29 2022 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=f8ff0304 ci: add black format check Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/test.yml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6659a14c..312a3452 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -138,3 +138,10 @@ jobs: - name: Run linting tools run: | pylint --exit-zero src/pkgcheck + + format: +runs-on: ubuntu-latest +steps: +- name: Checkout code + uses: actions/checkout@v3 +- uses: psf/black@stable
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 832171d1aad13dee4b9176c469bd579549502409 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Nov 13 21:34:24 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Nov 19 16:49:37 2022 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=832171d1 ci: update workflows Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/doc.yml | 6 ++ .github/workflows/release.yml | 25 + .github/workflows/test.yml| 13 + 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index a6552fec..b8a0101e 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -25,17 +25,15 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.10' -cache: 'pip' -cache-dependency-path: requirements/*.txt - name: Install dependencies run: | python -m pip install --upgrade pip -pip install -r requirements/dev.txt -r requirements/docs.txt +pip install ".[doc]" - name: Build sphinx documentation run: | -python setup.py build_docs +make html # notify github this isn't a jekyll site touch build/sphinx/html/.nojekyll diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bb70cb1..4ffd6f50 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ on: push: branches: [deploy] tags: [v*] + workflow_dispatch: jobs: build-sdist: @@ -19,22 +20,19 @@ jobs: - name: Install dependencies run: | -# install deps required for building sdist/wheels python -m pip install --upgrade pip -pip install -r requirements/dist.txt -r requirements/test.txt +pip install build ".[test,doc]" - name: Test with pytest env: PY_COLORS: 1 # forcibly enable pytest colors - run: python setup.py test + run: pytest - name: Build sdist run: | git clean -fxd -# build sdist -python setup.py sdist -# run in-place build so wheel deps use release versions -python setup.py build_py -i +make man +make sdist - name: Output dist file info run: | @@ -49,10 +47,6 @@ jobs: build-wheel: runs-on: ubuntu-latest -strategy: - fail-fast: false - matrix: -pyver: [cp39, cp310, cp311] steps: - name: Checkout code uses: actions/checkout@v3 @@ -62,13 +56,12 @@ jobs: with: output-dir: dist env: -CIBW_BUILD: ${{matrix.pyver}}-* +CIBW_BUILD: cp310-* CIBW_ARCHS_LINUX: x86_64 CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 -CIBW_BEFORE_BUILD: pip install -r {project}/requirements/dist.txt && {project}/.github/workflows/manylinux.sh -CIBW_BEFORE_TEST: pip install -r {project}/requirements/test.txt -CIBW_ENVIRONMENT: PY_COLORS=1 -CIBW_TEST_COMMAND: pytest -v {project}/tests +CIBW_BEFORE_BUILD: "{project}/.github/workflows/manylinux.sh && pip install '{project}'" +CIBW_BEFORE_TEST: pip install '{project}[test]' +CIBW_TEST_COMMAND: pytest {project}/tests - name: Upload wheel artifacts uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5af0c3a3..6659a14c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -66,9 +66,7 @@ jobs: - name: Pin dependencies to minimal versions if: ${{ matrix.deps == 'minimal-deps' }} - run: | -sed -i -e 's:~=:==:' requirements/* -mv requirements/install.txt requirements/dev.txt + run: sed -e '/^requires-python/!s/~=/==/' -i pyproject.toml # To use libtree-sitter-bash.so installed on the system, we need to compile # it manually, because ubuntu doesn't yet package (but Gentoo does) @@ -92,13 +90,12 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' -cache-dependency-path: requirements/*.txt +cache-dependency-path: pyproject.toml -- name: Install python deps +- name: Install dependencies run: | python -m pip install --upgrade pip -pip install -r requirements/test.txt -r requirements/ci.txt -pip install . +pip install ".[test]" - name: Test with pytest env: @@ -136,7 +133,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip -pip install -r requirements/dev.txt pylint +pip install . pylint - name: Run linting tools run: |
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: /, .github/workflows/
commit: 5fd8dcad9d55cdc1c98a3cd93c82e324e486bdc0 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Nov 14 20:42:05 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Nov 19 16:49:38 2022 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=5fd8dcad release: cleaner and cross support Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/manylinux.sh | 20 .github/workflows/release.yml | 19 --- pyproject.toml | 36 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/.github/workflows/manylinux.sh b/.github/workflows/manylinux.sh deleted file mode 100755 index c56892aa.. --- a/.github/workflows/manylinux.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Mangle the manylinux docker image to successfully build and test wheels. - -set -ex - -# install git -if command -v apk; then -apk add --no-cache git bash py3-lxml -elif command -v yum; then -yum update -y -yum install -y libxslt-devel libxml2-devel python-devel -else -apt-get update -apt-get install -y git libxml2-dev libxslt-dev python-dev -fi - -# download static build of recent bash release -URL="https://github.com/robxu9/bash-static/releases/download/5.1.016-1.2.3/bash-linux-${1:-x86_64}; -curl -L "$URL" > /usr/local/bin/bash -chmod +x /usr/local/bin/bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ffd6f50..6de38945 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,21 +47,26 @@ jobs: build-wheel: runs-on: ubuntu-latest +strategy: + fail-fast: false + matrix: +arch: [x86_64, aarch64, ppc64le, s390x] + steps: - name: Checkout code uses: actions/checkout@v3 +- name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: +platforms: ${{matrix.arch}} + - name: Build wheels - uses: joerick/cibuildwheel@v2.10.0 + uses: joerick/cibuildwheel@v2.11.2 with: output-dir: dist env: -CIBW_BUILD: cp310-* -CIBW_ARCHS_LINUX: x86_64 -CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 -CIBW_BEFORE_BUILD: "{project}/.github/workflows/manylinux.sh && pip install '{project}'" -CIBW_BEFORE_TEST: pip install '{project}[test]' -CIBW_TEST_COMMAND: pytest {project}/tests +CIBW_ARCHS_LINUX: ${{matrix.arch}} - name: Upload wheel artifacts uses: actions/upload-artifact@v3 diff --git a/pyproject.toml b/pyproject.toml index bb6410bc..6245024e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,3 +77,39 @@ version = {attr = "pkgcheck.__version__"} minversion = "6.0" addopts = "-vv -ra -l" testpaths = ["tests"] + +[tool.cibuildwheel] +build = "cp310-*" +build-frontend = "build" + +before-build = [ + "rm -f {project}/src/pkgcheck/bash/lang.so" +] +test-requires = ["pytest", "requests"] +test-command = "pytest {project}/tests" + +# glibc 2.24 +manylinux-x86_64-image = "manylinux_2_24" +manylinux-i686-image = "manylinux_2_24" +manylinux-aarch64-image = "manylinux_2_24" +manylinux-ppc64le-image = "manylinux_2_24" +manylinux-s390x-image = "manylinux_2_24" +test-skip = "*-*linux_{aarch64,ppc64le,s390x}" + +[[tool.cibuildwheel.overrides]] +select = "*-musllinux*" +before-all = [ + "apk add --no-cache git bash libxml2-dev libxslt-dev", +] + +[[tool.cibuildwheel.overrides]] +select = "*-manylinux*" +before-all = [ + "apt-get update", + "apt-get install -y git libxml2-dev libxslt-dev", + # "yum update -y", + # "yum install -y git libxslt-devel libxml2-devel", + + "curl -L \"https://github.com/robxu9/bash-static/releases/download/5.1.016-1.2.3/bash-linux-$(uname -m)\" -o /usr/local/bin/bash", + "chmod +x /usr/local/bin/bash", +]
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/, /
commit: d62b5f79361ad7394b0ecc74d282d35c2a640812 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 9 18:30:12 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 9 18:30:12 2022 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=d62b5f79 drop py3.8 and make py3.11 official Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/release.yml | 2 +- .github/workflows/test.yml| 12 ++-- setup.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6ddf1e1..3bb70cb1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: -pyver: [cp38, cp39, cp310, cp311] +pyver: [cp39, cp310, cp311] steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9412c4f1..5af0c3a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,16 +13,16 @@ jobs: strategy: matrix: os: [ubuntu-latest] -python-version: ['3.8', '3.9', '3.10'] +python-version: ['3.9', '3.10', '3.11'] deps: [newest-deps] experimental: [false] tree-sitter-bash: [bundled] include: - - os: ubuntu-latest -python-version: '3.11.0-beta - 3.11' -deps: newest-deps -experimental: true -tree-sitter-bash: bundled + # - os: ubuntu-latest + # python-version: '3.11.0-beta - 3.11' + # deps: newest-deps + # experimental: true + # tree-sitter-bash: bundled - os: ubuntu-latest python-version: '3.10' deps: minimal-deps diff --git a/setup.py b/setup.py index 23a3c8c5..5273192f 100755 --- a/setup.py +++ b/setup.py @@ -205,9 +205,9 @@ setup(**dict( ), classifiers=[ 'License :: OSI Approved :: BSD License', -'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', +'Programming Language :: Python :: 3.11', ], extras_require={ 'network': ['requests'],
[gentoo-commits] proj/pkgcore/pkgcheck:master commit in: .github/workflows/
commit: 54144966a34bcc3436a14d0f90546e18d44d6acd Author: Arthur Zamarin gentoo org> AuthorDate: Tue Oct 4 09:41:21 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Oct 4 09:41:21 2022 + URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=54144966 ci: use deploy using github actions instead of branch Using a branch is broken when using the mirroring. So use straight deployment using github actions. Signed-off-by: Arthur Zamarin gentoo.org> .github/workflows/doc.yml | 33 ++--- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index f2f159ee..a6552fec 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -3,9 +3,19 @@ name: doc on: push: branches: [master] + workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: "pages" + cancel-in-progress: true jobs: - build-and-deploy: + build: runs-on: ubuntu-latest steps: - name: Checkout code @@ -29,10 +39,19 @@ jobs: # notify github this isn't a jekyll site touch build/sphinx/html/.nojekyll -- name: Deploy docs to gh-pages - uses: JamesIves/github-pages-deploy-action@v4 +- name: Upload artifact + uses: actions/upload-pages-artifact@v1 with: -token: ${{ secrets.GITHUB_TOKEN }} -branch: gh-pages -folder: build/sphinx/html -single-commit: true +path: build/sphinx/html + + deploy: +environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} +runs-on: ubuntu-latest +needs: build + +steps: + - name: Deploy to GitHub Pages +id: deployment +uses: actions/deploy-pages@v1