Up skel and some cleanup. Drop py36.

ionelmc · ionelmc · commit 83d7ff3be24a · 2022-10-25T17:23:33.000+03:00
diff --git a/.cookiecutterrc b/.cookiecutterrc
@@ -1,55 +1,57 @@
 # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
 default_context:
-    allow_tests_inside_package: no
-    appveyor: no
+    allow_tests_inside_package: 'no'
+    appveyor: 'no'
     c_extension_function: '-'
     c_extension_module: '-'
-    c_extension_optional: yes
-    c_extension_support: yes
-    c_extension_test_pypi: yes
+    c_extension_optional: 'yes'
+    c_extension_support: 'yes'
+    c_extension_test_pypi: 'yes'
     c_extension_test_pypi_username: ionel
-    codacy: no
+    codacy: 'no'
     codacy_projectid: 862e7946eabb4112be6503a667381b71
-    codeclimate: no
-    codecov: yes
-    command_line_interface: no
+    codeclimate: 'no'
+    codecov: 'yes'
+    command_line_interface: 'no'
     command_line_interface_bin_name: '-'
-    coveralls: yes
+    coveralls: 'yes'
     distribution_name: lazy-object-proxy
     email: contact@ionelmc.ro
     full_name: Ionel Cristian Mărieș
-    github_actions: yes
-    legacy_python: no
+    github_actions: 'yes'
+    github_actions_osx: 'yes'
+    github_actions_windows: 'yes'
+    legacy_python: 'no'
     license: BSD 2-Clause License
     linter: flake8
     package_name: lazy_object_proxy
-    pre_commit: yes
+    pre_commit: 'yes'
+    pre_commit_formatter: black
     project_name: lazy-object-proxy
     project_short_description: A fast and thorough lazy object proxy.
-    pypi_badge: yes
-    pypi_disable_upload: no
-    release_date: '2021-03-22'
+    pypi_badge: 'yes'
+    pypi_disable_upload: 'no'
+    release_date: '2021-12-15'
     repo_hosting: github.com
     repo_hosting_domain: github.com
     repo_main_branch: master
     repo_name: python-lazy-object-proxy
     repo_username: ionelmc
-    requiresio: yes
-    scrutinizer: no
-    setup_py_uses_setuptools_scm: yes
-    setup_py_uses_test_runner: no
-    sphinx_docs: yes
+    requiresio: 'yes'
+    scrutinizer: 'no'
+    setup_py_uses_pytest_runner: 'no'
+    setup_py_uses_setuptools_scm: 'yes'
+    sphinx_docs: 'yes'
     sphinx_docs_hosting: https://python-lazy-object-proxy.readthedocs.io/
-    sphinx_doctest: no
+    sphinx_doctest: 'no'
     sphinx_theme: sphinx-py3doc-enhanced-theme
-    test_matrix_configurator: no
-    test_matrix_separate_coverage: yes
-    test_runner: pytest
-    travis: no
-    travis_osx: no
-    version: 1.6.0
+    test_matrix_configurator: 'no'
+    test_matrix_separate_coverage: 'yes'
+    travis: 'no'
+    travis_osx: 'no'
+    version: 1.7.1
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2014'
-    year_to: '2021'
+    year_to: '2022'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,15 +5,19 @@
 exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: debug-statements
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.9.3
+    rev: 5.10.1
     hooks:
       - id: isort
+  - repo: https://github.com/psf/black
+    rev: 22.10.0
+    hooks:
+      - id: black
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2
     hooks:
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2014-2019, Ionel Cristian Mărieș
-All rights reserved.
+Copyright (c) 2014-2022, Ionel Cristian Mărieș. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 following conditions are met:
diff --git a/ci/bootstrap.py b/ci/bootstrap.py
@@ -59,7 +59,7 @@ def main():
         loader=jinja2.FileSystemLoader(templates_path),
         trim_blocks=True,
         lstrip_blocks=True,
-        keep_trailing_newline=True
+        keep_trailing_newline=True,
     )
 
     tox_environments = [
diff --git a/ci/requirements.txt b/ci/requirements.txt
@@ -1,4 +1,5 @@
-virtualenv>=20.4.7
+virtualenv>=16.6.0
 pip>=19.1.1
 setuptools>=18.0.1
 six>=1.14.0
+tox
diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml
@@ -58,20 +58,20 @@ jobs:
 {% endfor %}
 {% endfor %}
     steps:
-    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-qemu-action@v2
       if: matrix.cibw_arch == 'aarch64'
       with:
         platforms: arm64
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: {{ '${{ matrix.python }}' }}
         architecture: {{ '${{ matrix.python_arch }}' }}
     - name: install dependencies
       run: |
-        python -mpip install --progress-bar=off twine tox cibuildwheel -r ci/requirements.txt
+        python -mpip install --progress-bar=off cibuildwheel -r ci/requirements.txt
         virtualenv --version
         pip --version
         tox --version
@@ -109,7 +109,7 @@ jobs:
       if: matrix.cibw_build
       run: twine check wheelhouse/*.whl
     - name: upload wheel
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       if: matrix.cibw_build
       with:
         path: wheelhouse/*.whl
diff --git a/docs/conf.py b/docs/conf.py
@@ -19,11 +19,12 @@
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'lazy-object-proxy'
-year = '2014-2021'
+year = '2014-2022'
 author = 'Ionel Cristian Mărieș'
 copyright = '{0}, {1}'.format(year, author)
 try:
     from pkg_resources import get_distribution
+
     version = release = get_distribution('lazy_object_proxy').version
 except Exception:
     traceback.print_exc()
@@ -35,10 +36,10 @@
     'issue': ('https://github.com/ionelmc/python-lazy-object-proxy/issues/%s', '#'),
     'pr': ('https://github.com/ionelmc/python-lazy-object-proxy/pull/%s', 'PR #'),
 }
-html_theme = "sphinx_py3doc_enhanced_theme"
+html_theme = 'sphinx_py3doc_enhanced_theme'
 html_theme_path = [sphinx_py3doc_enhanced_theme.get_html_theme_path()]
 html_theme_options = {
-    'githuburl': 'https://github.com/ionelmc/python-lazy-object-proxy/'
+    'githuburl': 'https://github.com/ionelmc/python-lazy-object-proxy/',
 }
 
 html_use_smartypants = True
diff --git a/docs/index.rst b/docs/index.rst
@@ -18,4 +18,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,3 +4,8 @@ requires = [
     "wheel",
     "setuptools_scm>=3.3.1",
 ]
+
+[tool.black]
+line-length = 140
+target-version = ['py37']
+skip-string-normalization = true
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,40 @@
+[pytest]
+# If a pytest section is found in one of the possible config files
+# (pytest.ini, tox.ini or setup.cfg), then pytest will not look for any others,
+# so if you add a pytest config section elsewhere,
+# you will need to delete this section from setup.cfg.
+norecursedirs =
+    .git
+    .tox
+    .env
+    dist
+    build
+    migrations
+
+python_files =
+    test_*.py
+    *_test.py
+    tests.py
+markers =
+    xfail_subclass: Expected test to fail with a subclass of Proxy.
+    xfail_simple: Expected test to fail on the `simple` implementation.
+addopts =
+    -ra
+    --strict-markers
+    --ignore=docs/conf.py
+    --ignore=setup.py
+    --ignore=ci
+    --ignore=.eggs
+    --doctest-modules
+    --doctest-glob=\*.rst
+    --tb=short
+testpaths =
+    tests
+
+# Idea from: https://til.simonwillison.net/pytest/treat-warnings-as-errors
+filterwarnings =
+    error
+# You can add exclusions, some examples:
+#    ignore:'lazy_object_proxy' defines default_app_config:PendingDeprecationWarning::
+#    ignore:The {{% if:::
+#    ignore:Coverage disabled via --no-cov switch!
diff --git a/setup.cfg b/setup.cfg
@@ -1,44 +1,7 @@
-[options]
-setup_requires =
-  setuptools_scm>=3.3.1
-
 [flake8]
 max-line-length = 140
 exclude = .tox,.eggs,ci/templates,build,dist
 
-[tool:pytest]
-# If a pytest section is found in one of the possible config files
-# (pytest.ini, tox.ini or setup.cfg), then pytest will not look for any others,
-# so if you add a pytest config section elsewhere,
-# you will need to delete this section from setup.cfg.
-norecursedirs =
-    .git
-    .tox
-    .env
-    dist
-    build
-    migrations
-
-python_files =
-    test_*.py
-    *_test.py
-    tests.py
-markers =
-    xfail_subclass: Expected test to fail with a subclass of Proxy.
-    xfail_simple: Expected test to fail on the `simple` implementation.
-addopts =
-    -ra
-    --strict-markers
-    --ignore=docs/conf.py
-    --ignore=setup.py
-    --ignore=ci
-    --ignore=.eggs
-    --doctest-modules
-    --doctest-glob=\*.rst
-    --tb=short
-testpaths =
-    tests
-
 [tool:isort]
 force_single_line = True
 line_length = 120
diff --git a/setup.py b/setup.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ def main():`
`59`	`59`	`loader=jinja2.FileSystemLoader(templates_path),`
`60`	`60`	`trim_blocks=True,`
`61`	`61`	`lstrip_blocks=True,`
`62`		`- keep_trailing_newline=True`
	`62`	`+ keep_trailing_newline=True,`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`tox_environments = [`
Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,8 @@ requires = [`
`4`	`4`	`"wheel",`
`5`	`5`	`"setuptools_scm>=3.3.1",`
`6`	`6`	`]`
	`7`	`+`
	`8`	`+[tool.black]`
	`9`	`+line-length = 140`
	`10`	`+target-version = ['py37']`
	`11`	`+skip-string-normalization = true`