From 0494fd6748def6f35ca8774b9cc7b0d5ece8e297 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Sat, 16 Apr 2022 12:38:45 +0000 Subject: [PATCH 1/2] Updated files with 'repo_helper'. --- .github/stale.yml | 10 +++++----- .github/workflows/conda_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- .pre-commit-config.yaml | 6 +++--- justfile | 23 +++++++++++++++++++++++ pyproject.toml | 26 ++++++++++++++++++++++++-- 6 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 justfile diff --git a/.github/stale.yml b/.github/stale.yml index e5625b7d..bb7fa62c 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -7,7 +7,7 @@ daysUntilStale: 180 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed. # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. -daysUntilClose: 180 +daysUntilClose: false # Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled) onlyLabels: [] @@ -31,10 +31,10 @@ exemptAssignees: false staleLabel: stale # Comment to post when marking as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. +markComment: false +# This issue has been automatically marked as stale because it has not had +# recent activity. It will be closed if no further activity occurs. Thank you +# for your contributions. # Comment to post when removing the stale label. # unmarkComment: > diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 2a578924..5e23b9d1 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -37,7 +37,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade "whey-conda" "setuptools<61,>=40.6.0" "wheel>=0.34.2" + python -m pip install --upgrade "whey-conda" "setuptools!=61.*,<61,>=40.6.0" "wheel>=0.34.2" # $CONDA is an environment variable pointing to the root of the miniconda directory $CONDA/bin/conda update -n base conda $CONDA/bin/conda config --add channels conda-forge diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index d7124d9d..7a5d1e36 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -199,7 +199,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade "mkrecipe" "setuptools<61,>=40.6.0" "wheel>=0.34.2" + python -m pip install --upgrade "mkrecipe" "setuptools!=61.*,<61,>=40.6.0" "wheel>=0.34.2" # $CONDA is an environment variable pointing to the root of the miniconda directory $CONDA/bin/conda config --set always_yes yes --set changeps1 no $CONDA/bin/conda update -n base conda diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74adcb4a..0782edfb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: ^domdf_python_tools/compat/importlib_resources.py$ repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.4.2 + rev: v0.4.3 hooks: - id: reformat-pyproject @@ -67,7 +67,7 @@ repos: - --keep-runtime-typing - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.1.11 + rev: v1.1.13 hooks: - id: remove-crlf - id: forbid-crlf @@ -78,7 +78,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.4.9 + rev: v0.4.10 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/justfile b/justfile new file mode 100644 index 00000000..f3b215e6 --- /dev/null +++ b/justfile @@ -0,0 +1,23 @@ +default: lint + +pdf-docs: latex-docs + make -C doc-source/build/latex/ + +latex-docs: + SPHINX_BUILDER=latex tox -e docs + +unused-imports: + tox -e lint -- --select F401 + +incomplete-defs: + #!/usr/bin/env bash + tox -e mypy -- --disallow-incomplete-defs --disallow-untyped-defs | grep "Function is missing a .* annotation" || exit 0 + +vdiff: + git diff $(repo-helper show version -q)..HEAD + +bare-ignore: + greppy '# type:? *ignore(?!\[|\w)' -s + +lint: unused-imports incomplete-defs bare-ignore + tox -n qa diff --git a/pyproject.toml b/pyproject.toml index f4d5558c..4e745521 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = [ "setuptools<61,>=40.6.0", "wheel>=0.34.2",] +requires = [ "setuptools!=61.*,<61,>=40.6.0", "wheel>=0.34.2",] build-backend = "setuptools.build_meta" [project] @@ -9,7 +9,24 @@ description = "Helpful functions for Python 🐍 🛠️" readme = "README.rst" requires-python = ">=3.6" keywords = [ "utilities",] -dynamic = [ "classifiers", "dependencies",] +dynamic = [ "dependencies",] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "Topic :: Software Development :: Libraries :: Python Modules", + "Typing :: Typed", +] [[project.authors]] name = "Dominic Davis-Foster" @@ -144,6 +161,11 @@ show_error_codes = true [tool.snippet-fmt] directives = [ "code-block",] +[tool.setuptools] +zip-safe = false +include-package-data = true +platforms = [ "Windows", "macOS", "Linux",] + [tool.dependency-dash."requirements.txt"] order = 10 From 1dc5659660029298342391a970033acc7f17343b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 16 Apr 2022 12:39:33 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4e745521..d6a23915 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,6 @@ description = "Helpful functions for Python 🐍 🛠️" readme = "README.rst" requires-python = ">=3.6" keywords = [ "utilities",] -dynamic = [ "dependencies",] classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", @@ -27,6 +26,7 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", "Typing :: Typed", ] +dynamic = [ "dependencies",] [[project.authors]] name = "Dominic Davis-Foster"