Skip to content

Commit cc5feb5

Browse files
committed
Sync config with master
1 parent 7c80cd8 commit cc5feb5

13 files changed

+32
-29
lines changed

.bumpversion.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ replace = : str = "{new_version}"
1717
[bumpversion:file:repo_helper.yml]
1818

1919
[bumpversion:file:pyproject.toml]
20+
21+
[bumpversion:file:setup.cfg]
22+
search = version = {current_version}
23+
replace = version = {new_version}

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ repos:
3131
args:
3232
- --allow-git
3333
- id: check-docstring-first
34-
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup|tests/.*)\.py$
34+
exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$
3535
- id: bind-requirements
3636

3737
- repo: https://github.com/domdfcoding/flake8-dunder-all
@@ -54,7 +54,7 @@ repos:
5454
- id: rst-inline-touching-normal
5555

5656
- repo: https://github.com/asottile/pyupgrade
57-
rev: v2.11.0
57+
rev: v2.12.0
5858
hooks:
5959
- id: pyupgrade
6060
args:
@@ -71,10 +71,10 @@ repos:
7171
rev: v0.4.3
7272
hooks:
7373
- id: formate
74-
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.(_)?py$
74+
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
7575

7676
- repo: https://github.com/domdfcoding/dep_checker
77-
rev: v0.6.0
77+
rev: v0.6.2
7878
hooks:
7979
- id: dep_checker
8080
args:

.readthedocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ python:
1515
- requirements: doc-source/requirements.txt
1616
- method: pip
1717
path: .
18+
extra_requirements:
19+
- all

README.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ domdf_python_tools
2525
* - Activity
2626
- |commits-latest| |commits-since| |maintained| |pypi-downloads|
2727
* - QA
28-
- |codefactor| |actions_flake8| |actions_mypy| |pre_commit_ci|
28+
- |codefactor| |actions_flake8| |actions_mypy|
2929
* - Other
3030
- |license| |language| |requires|
3131

@@ -115,10 +115,6 @@ domdf_python_tools
115115
:target: https://pypi.org/project/domdf_python_tools/
116116
:alt: PyPI - Downloads
117117

118-
.. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/domdf_python_tools/master.svg
119-
:target: https://results.pre-commit.ci/latest/github/domdfcoding/domdf_python_tools/master
120-
:alt: pre-commit.ci status
121-
122118
.. end shields
123119
124120
@@ -143,8 +139,8 @@ To install with ``conda``:
143139

144140
.. code-block:: bash
145141
146-
$ conda config --add channels http://conda.anaconda.org/conda-forge
147-
$ conda config --add channels http://conda.anaconda.org/domdfcoding
142+
$ conda config --add channels https://conda.anaconda.org/conda-forge
143+
$ conda config --add channels https://conda.anaconda.org/domdfcoding
148144
149145
* Then install
150146

__pkginfo__.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,12 @@
1111
# This script based on https://github.com/rocky/python-uncompyle6/blob/master/__pkginfo__.py
1212
#
1313

14-
# stdlib
15-
import pathlib
16-
1714
__all__ = [
18-
"__copyright__",
1915
"__version__",
20-
"repo_root",
21-
"install_requires",
2216
"extras_require",
2317
]
2418

25-
__copyright__ = """
26-
2019-2021 Dominic Davis-Foster <[email protected]>
27-
"""
28-
2919
__version__ = "2.9.0"
30-
repo_root = pathlib.Path(__file__).parent
31-
install_requires = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')
3220
extras_require = {
3321
"dates": ["pytz>=2019.1"],
3422
"testing": ["pytest>=6.2.0", "pytest-regressions>=2.0.2"],

doc-source/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
author = config["author"]
2323
documentation_summary = config.description
2424

25+
# 3rd party
26+
import domdf_python_tools
27+
28+
domdf_python_tools.__docs = True
29+
2530
github_url = "https://github.com/{github_username}/{github_repository}".format_map(config)
2631

2732
rst_prolog = f""".. |pkgname| replace:: domdf_python_tools

doc-source/index.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ domdf_python_tools
2828
* - Activity
2929
- |commits-latest| |commits-since| |maintained| |pypi-downloads|
3030
* - QA
31-
- |codefactor| |actions_flake8| |actions_mypy| |pre_commit_ci|
31+
- |codefactor| |actions_flake8| |actions_mypy|
3232
* - Other
3333
- |license| |language| |requires|
3434

@@ -121,9 +121,6 @@ domdf_python_tools
121121
:downloads: month
122122
:alt: PyPI - Downloads
123123

124-
.. |pre_commit_ci| pre-commit-ci-shield::
125-
:alt: pre-commit.ci status
126-
127124
.. end shields
128125
129126

doc-source/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ sphinx-debuginfo>=0.1.0
1414
sphinx-highlights>=0.1.0
1515
sphinx-notfound-page>=0.5
1616
sphinx-prompt>=1.1.0
17+
sphinx-pyproject>=0.1.0
1718
sphinx-tabs>=1.1.13
1819
sphinx-toolbox>=2.2.0
1920
sphinxcontrib-httpdomain>=1.7.0

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ keywords = [ "utilities",]
1111
dynamic = [ "requires-python", "classifiers", "dependencies",]
1212

1313
[[project.authors]]
14-
1514
name = "Dominic Davis-Foster"
15+
1616

1717

1818
[project.license]

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
[metadata]
1010
name = domdf_python_tools
11+
version = 2.9.0
1112
author = Dominic Davis-Foster
1213
author_email = [email protected]
1314
license = GNU Lesser General Public License v3 or later (LGPLv3+)

setup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# This file is managed by 'repo_helper'. Don't edit it directly.
33

44
# stdlib
5+
import pathlib
56
import shutil
67
import sys
78

@@ -13,6 +14,9 @@
1314
# this package
1415
from __pkginfo__ import * # pylint: disable=wildcard-import
1516

17+
repo_root = pathlib.Path(__file__).parent
18+
install_requires = (repo_root / "requirements.txt").read_text(encoding="UTF-8").split('\n')
19+
1620
setup(
1721
description="Helpful functions for Python 🐍 🛠️",
1822
extras_require=extras_require,

tests/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ coverage>=5.1
66
coverage-pyver-pragma>=0.2.1
77
faker>=4.1.2
88
flake8>=3.8.4
9+
importlib-metadata>=3.6.0
910
iniconfig!=1.1.0,>=1.0.1
1011
pandas>=1.0.0; implementation_name == "cpython" and python_version < "3.10"
1112
pytest>=6.0.0
1213
pytest-cov>=2.8.1
13-
pytest-randomly>=3.6.0
14+
pytest-randomly>=3.7.0
1415
pytest-regressions>=2.0.1
1516
pytest-rerunfailures>=9.1.1
1617
pytest-timeout>=1.4.2

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ basepython = python3.6
100100
skip_install = True
101101
ignore_errors = True
102102
whitelist_externals = /bin/bash
103+
passenv =
104+
COV_PYTHON_VERSION
105+
COV_PLATFORM
106+
COV_PYTHON_IMPLEMENTATION
103107
changedir = {toxinidir}
104108
deps =
105109
coverage>=5

0 commit comments

Comments
 (0)