Updated files with 'repo_helper'.

domdfcoding · May 4, 2022 · 0424e20 · 0424e20
1 parent 4b8622d
commit 0424e20
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 24 deletions.
diff --git 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/python_ci.yml b/.github/workflows/python_ci.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8'
 
     strategy:
       fail-fast: False
@@ -33,7 +33,7 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11.0-alpha.6", testenvs: "py311-dev,build", experimental: True}
+          - {python-version: "3.11.0-alpha.7", testenvs: "py311-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8'
 
     strategy:
       fail-fast: False
@@ -34,7 +34,7 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11.0-alpha.6", testenvs: "py311-dev,build", experimental: True}
+          - {python-version: "3.11.0-alpha.7", testenvs: "py311-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.6,pypy-3.7,pypy-3.8'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.7,pypy-3.7,pypy-3.8'
 
     strategy:
       fail-fast: False
@@ -33,7 +33,7 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
-          - {python-version: "3.11.0-alpha.6", testenvs: "py311-dev,build", experimental: True}
+          - {python-version: "3.11.0-alpha.7", testenvs: "py311-dev,build", experimental: True}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ exclude: ^$
 
 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/__pkginfo__.py b/__pkginfo__.py
@@ -6,9 +6,11 @@
 		"pubchem": [
 				"cawdrey>=0.1.7",
 				"mathematical>=0.1.13",
-				'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version != "3.6"',
+				'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.8" and platform_system == "Windows"',
+				'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.7" and platform_system != "Windows"',
 				'pillow>=7.0.0; platform_python_implementation != "PyPy"',
-				'pillow<=8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
+				'pillow<9.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.7" and platform_system == "Windows"',
+				'pillow<8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
 				"pyparsing>=2.4.6",
 				"tabulate>=0.8.9"
 				],
@@ -24,9 +26,11 @@
 				"mathematical>=0.1.13",
 				'matplotlib>=3.0.0; platform_machine != "aarch64" or python_version > "3.6"',
 				'matplotlib<=3.2.2; platform_machine == "aarch64" and python_version == "3.6"',
-				'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version != "3.6"',
+				'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.8" and platform_system == "Windows"',
+				'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.7" and platform_system != "Windows"',
 				'pillow>=7.0.0; platform_python_implementation != "PyPy"',
-				'pillow<=8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
+				'pillow<9.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.7" and platform_system == "Windows"',
+				'pillow<8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
 				"pyparsing>=2.4.6",
 				"tabulate>=0.8.9"
 				]

diff --git a/justfile 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
@@ -28,9 +28,11 @@ Documentation = "https://chemistry_tools.readthedocs.io/en/latest"
 pubchem = [
     "cawdrey>=0.1.7",
     "mathematical>=0.1.13",
-    'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version != "3.6"',
+    'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.8" and platform_system == "Windows"',
+    'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.7" and platform_system != "Windows"',
     'pillow>=7.0.0; platform_python_implementation != "PyPy"',
-    'pillow<=8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
+    'pillow<9.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.7" and platform_system == "Windows"',
+    'pillow<8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
     "pyparsing>=2.4.6",
     "tabulate>=0.8.9",
 ]
@@ -46,9 +48,11 @@ all = [
     "mathematical>=0.1.13",
     'matplotlib>=3.0.0; platform_machine != "aarch64" or python_version > "3.6"',
     'matplotlib<=3.2.2; platform_machine == "aarch64" and python_version == "3.6"',
-    'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version != "3.6"',
+    'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.8" and platform_system == "Windows"',
+    'pillow>=7.0.0; platform_python_implementation == "PyPy" and python_version >= "3.7" and platform_system != "Windows"',
     'pillow>=7.0.0; platform_python_implementation != "PyPy"',
-    'pillow<=8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
+    'pillow<9.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.7" and platform_system == "Windows"',
+    'pillow<8.0.0,>=7.0.0; platform_python_implementation == "PyPy" and python_version == "3.6"',
     "pyparsing>=2.4.6",
     "tabulate>=0.8.9",
 ]

diff --git a/tox.ini b/tox.ini
@@ -93,7 +93,7 @@ ignore_errors = True
 changedir = {toxinidir}
 extras = all
 deps =
-    mypy==0.931
+    mypy==0.942
     -r{toxinidir}/tests/requirements.txt
     -r{toxinidir}/stubs.txt
 commands = mypy chemistry_tools tests {posargs}
@@ -131,11 +131,11 @@ select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E
 extend-exclude = doc-source,old,build,dist,__pkginfo__.py,setup.py,venv
 rst-directives =
     TODO
+    autosummary-widths
     envvar
     extras-require
     license
     license-info
-	autosummary-widths
 rst-roles = choosealicense
 per-file-ignores =
     tests/*: D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000  SLOT000 SLOT001 SLOT002