From e50315707adfdcf9b2b23420f06e50e4968d68a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 14:27:37 +0000 Subject: [PATCH] chore(deps): bump versions (#204) * [create-pull-request] automated change * fix: update setuptools license specifications Signed-off-by: Henry Schreiner * ci: add note about running CI Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner Co-authored-by: henryiii Co-authored-by: Henry Schreiner --- .github/workflows/bump.yml | 2 +- docs/pages/guides/packaging_classic.md | 2 +- docs/pages/guides/style.md | 4 ++-- .../.github/workflows/ci.yml | 2 +- ...tter.__type == 'compiled' %}wheels.yml{% endif %} | 2 +- .../.pre-commit-config.yaml | 12 ++++++------ ... ['setuptools','pybind11'] %}setup.cfg{% endif %} | 8 +++++++- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml index 63687fbc..a985a79f 100644 --- a/.github/workflows/bump.yml +++ b/.github/workflows/bump.yml @@ -25,5 +25,5 @@ jobs: body: | Update the versions mentioned in the docs pages. - PR generated by "Update dependencies" [workflow](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}). + PR generated by "Update dependencies" [workflow](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}). Close and reopen to trigger ci. delete-branch: true diff --git a/docs/pages/guides/packaging_classic.md b/docs/pages/guides/packaging_classic.md index 9860aea9..fa2a0f98 100644 --- a/docs/pages/guides/packaging_classic.md +++ b/docs/pages/guides/packaging_classic.md @@ -267,7 +267,7 @@ author_email = me@email.com maintainer = My Organization maintainer_email = organization@email.com license = BSD-3-Clause -license_file = LICENSE +license_files = LICENSE classifiers = Development Status :: 4 - Beta Intended Audience :: Developers diff --git a/docs/pages/guides/style.md b/docs/pages/guides/style.md index 82748606..996d7224 100644 --- a/docs/pages/guides/style.md +++ b/docs/pages/guides/style.md @@ -435,7 +435,7 @@ when clearly better (please always use them, they are faster) if you set ```yaml - repo: https://github.com/asottile/pyupgrade - rev: "v3.7.0" + rev: "v3.8.0" hooks: - id: pyupgrade args: ["--py38-plus"] @@ -594,7 +594,7 @@ important parts (like Python classifiers) are in sync. This tool, ```yaml - repo: https://github.com/asottile/setup-cfg-fmt - rev: "v2.3.0" + rev: "v2.4.0" hooks: - id: setup-cfg-fmt args: [--include-version-classifiers, --max-py-version=3.12] diff --git a/{{cookiecutter.project_name}}/.github/workflows/ci.yml b/{{cookiecutter.project_name}}/.github/workflows/ci.yml index a11d96c4..75c89874 100644 --- a/{{cookiecutter.project_name}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_name}}/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: --durations=20 - name: Upload coverage report - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v3.1.4 {%- if not compiled %} diff --git a/{{cookiecutter.project_name}}/.github/workflows/{% if cookiecutter.__type == 'compiled' %}wheels.yml{% endif %} b/{{cookiecutter.project_name}}/.github/workflows/{% if cookiecutter.__type == 'compiled' %}wheels.yml{% endif %} index 3f754c0a..0d673607 100644 --- a/{{cookiecutter.project_name}}/.github/workflows/{% if cookiecutter.__type == 'compiled' %}wheels.yml{% endif %} +++ b/{{cookiecutter.project_name}}/.github/workflows/{% if cookiecutter.__type == 'compiled' %}wheels.yml{% endif %} @@ -42,7 +42,7 @@ jobs: with: fetch-depth: 0 - - uses: pypa/cibuildwheel@v2.12.3 + - uses: pypa/cibuildwheel@v2.13.1 - name: Upload wheels uses: actions/upload-artifact@v3 diff --git a/{{cookiecutter.project_name}}/.pre-commit-config.yaml b/{{cookiecutter.project_name}}/.pre-commit-config.yaml index ceba212a..42abe0d1 100644 --- a/{{cookiecutter.project_name}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_name}}/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: args: [--prose-wrap=always] - repo: https://github.com/asottile/blacken-docs - rev: "1.13.0" + rev: "1.14.0" hooks: - id: blacken-docs additional_dependencies: [black==23.3.0] @@ -53,7 +53,7 @@ repos: {%- if cookiecutter.backend == "setuptools" or cookiecutter.backend == "pybind11" %} - repo: https://github.com/asottile/setup-cfg-fmt - rev: "v2.2.0" + rev: "v2.4.0" hooks: - id: setup-cfg-fmt args: [--include-version-classifiers, --max-py-version=3.12] @@ -63,7 +63,7 @@ repos: {%- if cookiecutter.backend in ["pybind11", "skbuild", "mesonpy"] %} - repo: https://github.com/pre-commit/mirrors-clang-format - rev: "v16.0.2" + rev: "v16.0.6" hooks: - id: clang-format types_or: [c++, c, cuda] @@ -71,7 +71,7 @@ repos: {%- endif %} - repo: https://github.com/pre-commit/mirrors-mypy - rev: "v1.2.0" + rev: "v1.4.1" hooks: - id: mypy files: src|tests @@ -80,12 +80,12 @@ repos: - pytest - repo: https://github.com/codespell-project/codespell - rev: "v2.2.4" + rev: "v2.2.5" hooks: - id: codespell - repo: https://github.com/shellcheck-py/shellcheck-py - rev: "v0.9.0.2" + rev: "v0.9.0.5" hooks: - id: shellcheck diff --git a/{{cookiecutter.project_name}}/{% if cookiecutter.backend in ['setuptools','pybind11'] %}setup.cfg{% endif %} b/{{cookiecutter.project_name}}/{% if cookiecutter.backend in ['setuptools','pybind11'] %}setup.cfg{% endif %} index a74abce6..5b9705d3 100644 --- a/{{cookiecutter.project_name}}/{% if cookiecutter.backend in ['setuptools','pybind11'] %}setup.cfg{% endif %} +++ b/{{cookiecutter.project_name}}/{% if cookiecutter.backend in ['setuptools','pybind11'] %}setup.cfg{% endif %} @@ -10,8 +10,14 @@ author_email = {{ cookiecutter.email }} maintainer = The Scikit-HEP admins maintainer_email = scikit-hep-admins@googlegroups.com {%- endif %} +{%- if cookiecutter.license == "BSD" %} license = BSD-3-Clause -license_file = LICENSE +{%- elif cookiecutter.license == "Apache" %} +license = Apache-2.0 +{%- elif cookiecutter.license == "MIT" %} +license = MIT +{%- endif %} +license_files = LICENSE platforms = Any classifiers =