From 0094026bc0c9da218a178e5c78de2d2bff50a728 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 19 Dec 2022 15:14:14 +0000 Subject: [PATCH 01/77] Update tox testenv --- tox.ini | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index dc8400ea..ee4a8889 100644 --- a/tox.ini +++ b/tox.ini @@ -224,11 +224,10 @@ filterwarnings = [testenv] setenv = - PYTHONDEVMODE = 1 + PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -deps = - -r{toxinidir}/tests/requirements.txt - py311: py@git+https://github.com/pytest-dev/py@master + SETUPTOOLS_USE_DISTUTILS=stdlib +deps = -r{toxinidir}/tests/requirements.txt extras = all ignore_errors = True commands = From 745a729b9872c2bc9df4b691f4adde91a07e3018 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 12 Jan 2023 11:56:32 +0000 Subject: [PATCH 02/77] Update PathPlus to support Python 3.12 --- domdf_python_tools/paths.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/domdf_python_tools/paths.py b/domdf_python_tools/paths.py index a84fdd0f..23e1866f 100644 --- a/domdf_python_tools/paths.py +++ b/domdf_python_tools/paths.py @@ -401,12 +401,7 @@ def __new__(cls: Type[_PP], *args, **kwargs) -> _PP: # noqa: D102 if cls is PathPlus: cls = WindowsPathPlus if os.name == "nt" else PosixPathPlus # type: ignore - self = cls._from_parts(args, init=False) - if not self._flavour.is_supported: - raise NotImplementedError(f"cannot instantiate {cls.__name__!r} on your system") - - self._init() - return self + return super().__new__(cls, *args, **kwargs) def make_executable(self) -> None: """ From 347454c81d5158fc1cca9cb353d6537d3a00bb9f Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:39:43 +0000 Subject: [PATCH 03/77] Updated files with 'repo_helper'. (#94) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- README.rst | 2 +- doc-source/index.rst | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index abbed83c..23b4400f 100644 --- 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,3.12.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.3", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-alpha.4", testenvs: "py312-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 index 35f7b2e4..d1662b09 100644 --- 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,3.12.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.3", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-alpha.4", testenvs: "py312-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 index 35d27f14..4e09dfef 100644 --- 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,3.12.0-alpha.3,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.3", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-alpha.4", testenvs: "py312-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39", experimental: True} diff --git a/README.rst b/README.rst index bdeb6521..5c60b931 100644 --- a/README.rst +++ b/README.rst @@ -108,7 +108,7 @@ domdf_python_tools :target: https://github.com/domdfcoding/domdf_python_tools/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2022 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2023 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/domdf_python_tools diff --git a/doc-source/index.rst b/doc-source/index.rst index 5791318e..2c15042c 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -115,7 +115,7 @@ domdf_python_tools :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2022 + .. |maintained| maintained-shield:: 2023 :alt: Maintenance .. |pypi-downloads| pypi-shield:: From 95489de82aefc844bfbba641ce56dea119bb0993 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 12 Jan 2023 15:38:36 +0000 Subject: [PATCH 04/77] Appease mypy on Windows --- tests/test_paths_stdlib.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/test_paths_stdlib.py b/tests/test_paths_stdlib.py index e8d414d6..82d0a85c 100644 --- a/tests/test_paths_stdlib.py +++ b/tests/test_paths_stdlib.py @@ -204,6 +204,9 @@ def test_lstat_nosymlink(BASE: PathPlus): def test_owner(BASE: PathPlus): pwd = pytest.importorskip("pwd", reason="the pwd module is needed for this test") + if sys.platform == "win32": + return + p = PathPlus(BASE) / "fileA" uid = p.stat().st_uid try: @@ -216,6 +219,9 @@ def test_owner(BASE: PathPlus): def test_group(BASE: PathPlus): grp = pytest.importorskip("grp", reason="the grp module is needed for this test") + if sys.platform == "win32": + return + p = PathPlus(BASE) / "fileA" gid = p.stat().st_gid try: From fbcd9fa126dc3b28917795e611f96594087988a6 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 15:38:20 +0000 Subject: [PATCH 05/77] Updated files with 'repo_helper'. (#95) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 +++- .github/workflows/python_ci_linux.yml | 4 +++- .github/workflows/python_ci_macos.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 23b4400f..4f37ee66 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -59,7 +59,9 @@ jobs: if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} uses: "actions/setup-python@v4" with: - python-version: "${{ matrix.config.python-version }}" + python-version: | + ${{ matrix.config.python-version }} + 3.8 - name: Install dependencies πŸ”§ if: steps.setup-python.outcome == 'success' diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index d1662b09..24666d8f 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -60,7 +60,9 @@ jobs: if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} uses: "actions/setup-python@v4" with: - python-version: "${{ matrix.config.python-version }}" + python-version: | + ${{ matrix.config.python-version }} + 3.8 - name: Install dependencies πŸ”§ if: steps.setup-python.outcome == 'success' diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 4e09dfef..c6b73aff 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -58,7 +58,9 @@ jobs: if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} uses: "actions/setup-python@v4" with: - python-version: "${{ matrix.config.python-version }}" + python-version: | + ${{ matrix.config.python-version }} + 3.8 - name: Install dependencies πŸ”§ if: steps.setup-python.outcome == 'success' From 2f77691307194e56620f8405b01898f9f8299854 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 12 Jan 2023 15:52:42 +0000 Subject: [PATCH 06/77] Make some type: ignore comments more specific --- domdf_python_tools/bases.py | 10 +++++----- tests/test_getters.py | 6 +++--- tests/test_iterative.py | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/domdf_python_tools/bases.py b/domdf_python_tools/bases.py index c01515d7..d25b380e 100644 --- a/domdf_python_tools/bases.py +++ b/domdf_python_tools/bases.py @@ -106,7 +106,7 @@ def __getstate__(self) -> Dict[str, _V]: return self.__dict__ def __setstate__(self, state): - self.__init__(**state) # type: ignore + self.__init__(**state) # type: ignore[misc] def __copy__(self): return self.__class__(**self.__dict__) @@ -219,7 +219,7 @@ def __setitem__(self, i: int, o: _T) -> None: ... def __setitem__(self, i: slice, o: Iterable[_T]) -> None: ... def __setitem__(self, i: Union[int, slice], item: Union[_T, Iterable[_T]]) -> None: - self.data[i] = item # type: ignore + self.data[i] = item # type: ignore[index, assignment] def __delitem__(self, i: Union[int, slice]): del self.data[i] @@ -422,7 +422,7 @@ def __sub__(self: _F, other: float) -> _F: def __mul__(self: _F, other: float) -> _F: return self.__class__(float(self).__mul__(other)) - def __floordiv__(self: _F, other: float) -> _F: # type: ignore + def __floordiv__(self: _F, other: float) -> _F: # type: ignore[override] return self.__class__(float(self).__floordiv__(other)) def __truediv__(self: _F, other: float) -> _F: @@ -432,7 +432,7 @@ def __mod__(self: _F, other: float) -> _F: return self.__class__(float(self).__mod__(other)) def __divmod__(self: _F, other: float) -> Tuple[_F, _F]: - return tuple(self.__class__(x) for x in float(self).__divmod__(other)) # type: ignore + return tuple(self.__class__(x) for x in float(self).__divmod__(other)) # type: ignore[return-value] def __pow__(self: _F, other: float, mod=None) -> _F: return self.__class__(float(self).__pow__(other, mod)) @@ -446,7 +446,7 @@ def __rsub__(self: _F, other: float) -> _F: def __rmul__(self: _F, other: float) -> _F: return self.__class__(float(self).__rmul__(other)) - def __rfloordiv__(self: _F, other: float) -> _F: # type: ignore + def __rfloordiv__(self: _F, other: float) -> _F: # type: ignore[override] return self.__class__(float(self).__rfloordiv__(other)) def __rtruediv__(self: _F, other: float) -> _F: diff --git a/tests/test_getters.py b/tests/test_getters.py index 9ddd208c..dd433626 100644 --- a/tests/test_getters.py +++ b/tests/test_getters.py @@ -55,13 +55,13 @@ class A: f([a, b]) with pytest.raises(TypeError, match="attribute name must be a string"): - attrgetter(0, 2) # type: ignore + attrgetter(0, 2) # type: ignore[arg-type] with pytest.raises(TypeError, match="'idx' must be an integer"): - attrgetter("hello", 0) # type: ignore + attrgetter("hello", 0) # type: ignore[arg-type] with pytest.raises(TypeError, match=r"__init__\(\) missing 1 required positional argument: 'attr'"): - attrgetter(0) # type: ignore + attrgetter(0) # type: ignore[call-arg] f = attrgetter(1, "name") diff --git a/tests/test_iterative.py b/tests/test_iterative.py index 06a85c9c..ca7b3524 100644 --- a/tests/test_iterative.py +++ b/tests/test_iterative.py @@ -313,10 +313,10 @@ def test_count(): assert take(2, zip("abc", count(-3))) == [('a', -3), ('b', -2)] with pytest.raises(TypeError, match=r"count\(\) takes from 0 to 2 positional arguments but 3 were given"): - count(2, 3, 4) # type: ignore + count(2, 3, 4) # type: ignore[call-arg] with pytest.raises(TypeError, match="a number is required"): - count('a') # type: ignore + count('a') # type: ignore[type-var] assert take(10, count(sys.maxsize - 5)) == list(range(sys.maxsize - 5, sys.maxsize + 5)) assert take(10, count(-sys.maxsize - 5)) == list(range(-sys.maxsize - 5, -sys.maxsize + 5)) @@ -364,10 +364,10 @@ def test_count_with_stride(): assert lzip("abc", count(step=-1)) == [('a', 0), ('b', -1), ('c', -2)] with pytest.raises(TypeError, match="a number is required"): - count('a', 'b') # type: ignore + count('a', 'b') # type: ignore[type-var] with pytest.raises(TypeError, match="a number is required"): - count(5, 'b') # type: ignore + count(5, 'b') # type: ignore[type-var] assert lzip("abc", count(2, 0)) == [('a', 2), ('b', 2), ('c', 2)] assert lzip("abc", count(2, 1)) == [('a', 2), ('b', 3), ('c', 4)] @@ -474,5 +474,5 @@ def test_subclassing_count(): match="type 'domdf_python_tools.iterative.count' is not an acceptable base type", ): - class MyCount(CountType): # type: ignore + class MyCount(CountType): # type: ignore[valid-type,misc] pass From 8c9abd67c8669cfe21fefe5f4588a67dfe2e63af Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 17 Jan 2023 07:46:48 +0000 Subject: [PATCH 07/77] Bump version v3.5.1 -> v3.6.0 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 18deaa19..162800e1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.5.1 +current_version = 3.6.0 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index dc9c0292..63d4378c 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -55,7 +55,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.5.1=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.6.0=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 5c60b931..3aadee57 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.5.1 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.6.0 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index 2c15042c..88640e6f 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.5.1 + :commits-since: v3.6.0 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 51ce85b2..1ce435bd 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.5.1" +__version__: str = "3.6.0" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index a04d1883..3fa65465 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.5.1" +version = "3.6.0" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index bef9302a..9c1e2eba 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.5.1" +version: "3.6.0" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index 063a0215..24631ac1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.5.1 +version = 3.6.0 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From 0beabd0eb7ee81b5ebec7279f288d12b337a9425 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 23 Jan 2023 14:24:06 +0000 Subject: [PATCH 08/77] Set python version for setup-miniconda --- .github/workflows/conda_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 63d4378c..f94552c9 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -31,6 +31,7 @@ jobs: with: activate-environment: env conda-build-version: 3.21.0 + python-version: "3.8" - name: Install dependencies πŸ”§ run: | From 9b57e126eb3c4a2b9c4a97a1f0af1ee788eb35f9 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 23 Jan 2023 14:28:25 +0000 Subject: [PATCH 09/77] Set miniforge-variant for conda CI --- .github/workflows/conda_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index f94552c9..e2c23786 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -32,6 +32,7 @@ jobs: activate-environment: env conda-build-version: 3.21.0 python-version: "3.8" + miniforge-variant: Mambaforge - name: Install dependencies πŸ”§ run: | From 1ce0cd4ac9a4a1392460a729c84f8f44889f211d Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 23 Jan 2023 14:32:56 +0000 Subject: [PATCH 10/77] Uncap conda-build --- .github/workflows/conda_ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index e2c23786..65ea3c75 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -30,7 +30,6 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.21.0 python-version: "3.8" miniforge-variant: Mambaforge From 295234952b9eaa209f93d053a1377422cd3130bb Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 23 Jan 2023 14:51:39 +0000 Subject: [PATCH 11/77] Bump conda-build --- .github/workflows/conda_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 65ea3c75..bc4d9ed1 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -30,6 +30,7 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env + conda-build-version: 3.23.3 python-version: "3.8" miniforge-variant: Mambaforge From 282ccc4237cdfc830ae39f271188fdd0a83398b8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 23 Jan 2023 14:58:55 +0000 Subject: [PATCH 12/77] Run conda CI on Ubuntu 22.04 --- .github/workflows/conda_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index bc4d9ed1..85973cb2 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -12,7 +12,7 @@ permissions: jobs: tests: name: "Conda" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 defaults: run: shell: bash -l {0} From 19bd22c426812476be37d2099b7f11dc24aa82bf Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:18:41 +0000 Subject: [PATCH 13/77] Updated files with 'repo_helper'. (#97) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 +--- .github/workflows/python_ci_linux.yml | 10 +++++----- .github/workflows/python_ci_macos.yml | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 4f37ee66..23b4400f 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -59,9 +59,7 @@ jobs: if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} uses: "actions/setup-python@v4" with: - python-version: | - ${{ matrix.config.python-version }} - 3.8 + python-version: "${{ matrix.config.python-version }}" - name: Install dependencies πŸ”§ if: steps.setup-python.outcome == 'success' diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 24666d8f..f29acb8c 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -60,9 +60,7 @@ jobs: if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} uses: "actions/setup-python@v4" with: - python-version: | - ${{ matrix.config.python-version }} - 3.8 + python-version: "${{ matrix.config.python-version }}" - name: Install dependencies πŸ”§ if: steps.setup-python.outcome == 'success' @@ -180,7 +178,7 @@ jobs: Conda: needs: deploy - runs-on: "ubuntu-18.04" + runs-on: ubuntu-22.04 if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true) steps: - name: Checkout πŸ›ŽοΈ @@ -195,7 +193,9 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.21.0 + conda-build-version: 3.23.3 + python-version: "3.8" + miniforge-variant: Mambaforge - name: Install dependencies πŸ”§ run: | diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index c6b73aff..4e09dfef 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -58,9 +58,7 @@ jobs: if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} uses: "actions/setup-python@v4" with: - python-version: | - ${{ matrix.config.python-version }} - 3.8 + python-version: "${{ matrix.config.python-version }}" - name: Install dependencies πŸ”§ if: steps.setup-python.outcome == 'success' From 01f89f4d4747cc0156b25ad7ab48272024e0d49b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 6 Apr 2023 16:40:37 +0100 Subject: [PATCH 14/77] Skip NotImplementedError test for PathPlus on 3.12 --- tests/test_paths.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_paths.py b/tests/test_paths.py index d4dea3ed..22e411be 100644 --- a/tests/test_paths.py +++ b/tests/test_paths.py @@ -350,6 +350,7 @@ def test_make_executable(): assert os.access(tempfile, os.X_OK) +@pytest.mark.skipif(sys.version_info[:2] > (3, 11), reason="No longer valid on Python 3.12+") def test_instantiate_wrong_platform(): if os.name == "nt": with pytest.raises(NotImplementedError, match="cannot instantiate .* on your system"): From 8e3e1c3fadd50cadb276bb4cbcd26a91dcf508ed Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 23:19:29 +0100 Subject: [PATCH 15/77] [repo-helper] Configuration Update (#99) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .bumpversion.cfg | 2 ++ .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- tox.ini | 9 +++++++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 162800e1..38d3208d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -24,3 +24,5 @@ search = version = {current_version} replace = version = {new_version} [bumpversion:file:.github/workflows/conda_ci.yml] +search = ={current_version}=py_1 +replace = ={new_version}=py_1 diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 23b4400f..dac4e7d5 100644 --- 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,3.12.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.4", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-alpha.7", testenvs: "py312-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 index f29acb8c..903a56aa 100644 --- 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,3.12.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.4", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-alpha.7", testenvs: "py312-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 index 4e09dfef..d9bf603d 100644 --- 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,3.12.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.4", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39", experimental: True} diff --git a/tox.ini b/tox.ini index ee4a8889..377d5624 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ # You may add new sections, but any changes made to the following sections will be lost: # * tox # * envlists +# * testenv:.package # * testenv:py312-dev # * testenv:docs # * testenv:build @@ -55,6 +56,11 @@ test = qa = mypy, lint cov = py36, coverage +[testenv:.package] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + [testenv:py312-dev] setenv = PYTHONDEVMODE=1 @@ -70,6 +76,9 @@ deps = -r{toxinidir}/doc-source/requirements.txt commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs} [testenv:build] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 skip_install = True changedir = {toxinidir} deps = From 500b2b2974fe6e8c5c85d7155081814f4be93d5d Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 10:51:22 +0000 Subject: [PATCH 16/77] Updated files with 'repo_helper'. (#100) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- README.rst | 4 ++-- doc-source/index.rst | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dd6103ff..ecdc160a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - id: flake2lint - repo: https://github.com/pre-commit/pygrep-hooks - rev: v1.9.0 + rev: v1.10.0 hooks: - id: python-no-eval - id: rst-backticks @@ -70,7 +70,7 @@ repos: - --keep-runtime-typing - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.3.1 + rev: v1.5.1 hooks: - id: remove-crlf - id: forbid-crlf @@ -87,7 +87,7 @@ repos: exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.7.0 + rev: v0.7.1 hooks: - id: dep_checker args: diff --git a/README.rst b/README.rst index 3aadee57..f57172e3 100644 --- a/README.rst +++ b/README.rst @@ -29,8 +29,8 @@ domdf_python_tools * - Other - |license| |language| |requires| -.. |docs| image:: https://img.shields.io/readthedocs/domdf_python_tools/latest?logo=read-the-docs - :target: https://domdf_python_tools.readthedocs.io/en/latest +.. |docs| image:: https://img.shields.io/readthedocs/domdf-python-tools/latest?logo=read-the-docs + :target: https://domdf-python-tools.readthedocs.io/en/latest :alt: Documentation Build Status .. |docs_check| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/Docs%20Check/badge.svg diff --git a/doc-source/index.rst b/doc-source/index.rst index 88640e6f..dc2cb11b 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -34,7 +34,7 @@ domdf_python_tools - |license| |language| |requires| .. |docs| rtfd-shield:: - :project: domdf_python_tools + :project: domdf-python-tools :alt: Documentation Build Status .. |docs_check| actions-shield:: diff --git a/pyproject.toml b/pyproject.toml index 3fa65465..d02ae9cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ file = "LICENSE" Homepage = "https://github.com/domdfcoding/domdf_python_tools" "Issue Tracker" = "https://github.com/domdfcoding/domdf_python_tools/issues" "Source Code" = "https://github.com/domdfcoding/domdf_python_tools" -Documentation = "https://domdf_python_tools.readthedocs.io/en/latest" +Documentation = "https://domdf-python-tools.readthedocs.io/en/latest" [project.optional-dependencies] dates = [ "pytz>=2019.1",] diff --git a/setup.cfg b/setup.cfg index 24631ac1..791f4bdd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ long_description_content_type = text/x-rst platforms = Windows, macOS, Linux url = https://github.com/domdfcoding/domdf_python_tools project_urls = - Documentation = https://domdf_python_tools.readthedocs.io/en/latest + Documentation = https://domdf-python-tools.readthedocs.io/en/latest Issue Tracker = https://github.com/domdfcoding/domdf_python_tools/issues Source Code = https://github.com/domdfcoding/domdf_python_tools classifiers = From d01397ae9995b0b72d5ca9f722bca36cda55b4ef Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 14 Apr 2023 12:22:49 +0100 Subject: [PATCH 17/77] Bump version v3.6.0 -> v3.6.1 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 38d3208d..928c723b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.6.0 +current_version = 3.6.1 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 85973cb2..5e726931 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.6.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.6.1=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index f57172e3..331cf740 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.6.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.6.1 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index dc2cb11b..f31365bd 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.6.0 + :commits-since: v3.6.1 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 1ce435bd..5ba5c15b 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.6.0" +__version__: str = "3.6.1" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index d02ae9cf..39064ddb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.6.0" +version = "3.6.1" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index 9c1e2eba..52e516b8 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.6.0" +version: "3.6.1" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index 791f4bdd..f78c1878 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.6.0 +version = 3.6.1 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From 05c5052386dbabedce3debf12e4458433096a33f Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 1 Jun 2023 14:15:53 +0100 Subject: [PATCH 18/77] Don't error on ast deprecation warnings --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index 377d5624..3308850c 100644 --- a/tox.ini +++ b/tox.ini @@ -230,6 +230,11 @@ filterwarnings = error ignore:can't resolve package from __spec__ or __package__, falling back on __name__ and __path__:ImportWarning ignore::DeprecationWarning:certifi + always:ast.Str is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning + always:Attribute s is deprecated and will be removed in Python 3.14; use value instead:DeprecationWarning + always:ast.Num is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning + always:ast.NameConstant is deprecated and will be removed in Python 3.14; use ast.Constant:DeprecationWarning + always:datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning [testenv] setenv = From 518b685d35e7e2d815cd4ac953a1ab94e02e00e3 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 2 Jun 2023 09:08:23 +0100 Subject: [PATCH 19/77] Lint --- domdf_python_tools/dates.py | 3 ++- domdf_python_tools/pagesizes/__init__.py | 8 ++++---- domdf_python_tools/stringlist.py | 2 +- tests/test_namedlist.py | 2 +- tests/test_pagesizes/test_pagesizes.py | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/domdf_python_tools/dates.py b/domdf_python_tools/dates.py index 110114d6..4320ed92 100644 --- a/domdf_python_tools/dates.py +++ b/domdf_python_tools/dates.py @@ -324,7 +324,8 @@ def is_bst(the_date: Union[time.struct_time, datetime.date]) -> bool: """ Calculates whether the given day falls within British Summer Time. - This function should also be applicable to other timezones which change to summer time on the same date (e.g. Central European Summer Time). + This function should also be applicable to other timezones + which change to summer time on the same date (e.g. Central European Summer Time). .. note:: diff --git a/domdf_python_tools/pagesizes/__init__.py b/domdf_python_tools/pagesizes/__init__.py index 347f6f49..2d69859a 100644 --- a/domdf_python_tools/pagesizes/__init__.py +++ b/domdf_python_tools/pagesizes/__init__.py @@ -39,7 +39,7 @@ # # this package -from .classes import * -from .sizes import * -from .units import * -from .utils import * +from .classes import * # noqa: F401 +from .sizes import * # noqa: F401 +from .units import * # noqa: F401 +from .utils import * # noqa: F401 diff --git a/domdf_python_tools/stringlist.py b/domdf_python_tools/stringlist.py index 2d8524ca..2f376273 100644 --- a/domdf_python_tools/stringlist.py +++ b/domdf_python_tools/stringlist.py @@ -513,7 +513,7 @@ def splitlines(string: str) -> List[Tuple[str, str]]: while i < str_len: # Find a line and append it - while i < str_len and not string[i] in "\n\r": + while i < str_len and string[i] not in "\n\r": i += 1 # Skip the line break reading CRLF as one line break diff --git a/tests/test_namedlist.py b/tests/test_namedlist.py index 7cfc115a..81bdac2d 100644 --- a/tests/test_namedlist.py +++ b/tests/test_namedlist.py @@ -82,7 +82,7 @@ class NamedListTest: str_out = "ShoppingList['egg and bacon', 'egg sausage and bacon', 'egg and spam', 'egg bacon and spam']" cls_str: str - def test(self, capsys): + def test_(self, capsys): assert isinstance(self.shopping_list, UserList) assert self.shopping_list[0] == "egg and bacon" diff --git a/tests/test_pagesizes/test_pagesizes.py b/tests/test_pagesizes/test_pagesizes.py index 5b04cadd..382a5a58 100644 --- a/tests/test_pagesizes/test_pagesizes.py +++ b/tests/test_pagesizes/test_pagesizes.py @@ -178,7 +178,7 @@ def test_convert_size(unit: Unit): pytest.param(2, 5, 10, id="not isinstance(from_, Unit)"), ], ) -def test_convert_from(value: List[int], unit, expects: Tuple[float, ...]): +def test_convert_from(value: List[int], unit: Unit, expects: Tuple[float, ...]): assert convert_from(value, unit) == expects From 3c6da47a59b6b36407706038591731201c0bf482 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 2 Jun 2023 09:18:07 +0100 Subject: [PATCH 20/77] Update test_dates.py for Python 3.12 --- tests/test_dates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_dates.py b/tests/test_dates.py index 0fc5b603..0dc77c31 100644 --- a/tests/test_dates.py +++ b/tests/test_dates.py @@ -25,7 +25,7 @@ import pytz test_date = datetime(1996, 10, 13, 2, 20).replace(tzinfo=pytz.utc) - today = datetime.utcnow().replace(tzinfo=pytz.utc) # make sure UTC + today = datetime.now(pytz.utc) # make sure UTC def test_utc_offset(): # Check that the correct UTC offsets are given for common timezones From 13f3bb92309cc300cd120c5e836e43a93be68dd6 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 08:39:57 +0000 Subject: [PATCH 21/77] Updated files with 'repo_helper'. (#101) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- tox.ini | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index dac4e7d5..6c0a6a6a 100644 --- 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,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-beta.1", testenvs: "py312-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 index 903a56aa..0e46b46a 100644 --- 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,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-beta.1", testenvs: "py312-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 index d9bf603d..76a0d26c 100644 --- 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,3.12.0-alpha.7,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-beta.1", testenvs: "py312-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39", experimental: True} diff --git a/tox.ini b/tox.ini index 3308850c..06c1eaa2 100644 --- a/tox.ini +++ b/tox.ini @@ -85,6 +85,7 @@ deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 twine>=3.2.0 + cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" twine check dist/*.tar.gz dist/*.whl From 1f013f5de59a2d7a83e2b701c4b510005a5cc7ef Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 22:42:22 +0100 Subject: [PATCH 22/77] Updated files with 'repo_helper'. (#103) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 8 ++++---- .github/workflows/python_ci_linux.yml | 6 +++--- .github/workflows/python_ci_macos.yml | 6 +++--- .pre-commit-config.yaml | 6 +++--- .readthedocs.yml | 12 +++++++----- doc-source/requirements.txt | 16 ++++++++-------- tox.ini | 4 +++- 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 6c0a6a6a..8bbb3e00 100644 --- 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,3.12.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,11 +34,11 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-beta.1", testenvs: "py312-dev,build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} + - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} + - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 0e46b46a..862d909a 100644 --- 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,3.12.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,11 +35,11 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-beta.1", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-rc.1", testenvs: "py312-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} - - {python-version: "pypy-3.9", testenvs: "pypy39", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 76a0d26c..e9420ea9 100644 --- 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,3.12.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,10 +34,10 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-beta.1", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ecdc160a..73f81d41 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.7.0 + rev: v0.9.0 hooks: - id: reformat-pyproject @@ -43,7 +43,7 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.2.2 + rev: v0.3.0 hooks: - id: ensure-dunder-all files: ^domdf_python_tools/.*\.py$ @@ -81,7 +81,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.4.10 + rev: v0.5.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/.readthedocs.yml b/.readthedocs.yml index 6dfba21c..615e8643 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,11 +9,13 @@ formats: - pdf - htmlzip python: - version: 3.8 install: - requirements: requirements.txt - requirements: doc-source/requirements.txt - - method: pip - path: . - extra_requirements: - - all +build: + os: ubuntu-20.04 + tools: + python: '3.9' + jobs: + post_create_environment: + - pip install .[all] diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 584c8d62..67155704 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -1,24 +1,24 @@ -default-values>=0.5.0 +default-values>=0.6.0 domdf-sphinx-theme>=0.3.0 -extras-require>=0.2.0 -html-section>=0.1.0 +extras-require>=0.5.0 +html-section>=0.3.0 jinja2<3.1 pandas>=1.1.2 pytest>=6.2.0 pytest-regressions>=2.0.2 pytz>=2019.1 -seed-intersphinx-mapping>=0.3.1 +seed-intersphinx-mapping>=1.2.2 sphinx>=3.0.3 sphinx-autofixture>=0.2.1 sphinx-copybutton>=0.2.12 -sphinx-debuginfo>=0.1.0 +sphinx-debuginfo>=0.2.2 sphinx-highlights>=0.1.0 -sphinx-licenseinfo>=0.1.1 +sphinx-licenseinfo>=0.3.1 sphinx-notfound-page>=0.7.1 sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 sphinx-tabs>=1.1.13 -sphinx-toolbox>=3.0.0 +sphinx-toolbox>=3.5.0 sphinxcontrib-httpdomain>=1.7.0 sphinxemoji>=0.1.6 -toctree-plus>=0.5.0 +toctree-plus>=0.6.1 diff --git a/tox.ini b/tox.ini index 06c1eaa2..daa83de9 100644 --- a/tox.ini +++ b/tox.ini @@ -79,6 +79,7 @@ commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs} setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + PIP_PREFER_BINARY=1 skip_install = True changedir = {toxinidir} deps = @@ -171,7 +172,7 @@ commands = [flake8] max-line-length = 120 -select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E225 E226 E227 E228 E231 E241 E242 E251 E261 E262 E265 E271 E272 E303 E304 E306 E402 E502 E703 E711 E712 E713 E714 E721 W291 W292 W293 W391 W504 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q001 Q002 Q003 A001 A002 A003 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 ENC001 ENC002 ENC003 ENC004 ENC011 ENC012 ENC021 ENC022 ENC023 ENC024 ENC025 ENC026 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 NQA001 NQA002 NQA003 NQA004 NQA005 NQA102 NQA103 E301 E302 E305 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 +select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E225 E226 E227 E228 E231 E241 E242 E251 E261 E262 E265 E271 E272 E303 E304 E306 E402 E502 E703 E711 E712 E713 E714 E721 W291 W292 W293 W391 W504 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q001 Q002 Q003 A001 A002 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 ENC001 ENC002 ENC003 ENC004 ENC011 ENC012 ENC021 ENC022 ENC023 ENC024 ENC025 ENC026 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 NQA001 NQA002 NQA003 NQA004 NQA005 NQA102 NQA103 E301 E302 E305 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 extend-exclude = doc-source,old,build,dist,__pkginfo__.py,setup.py,venv rst-directives = TODO @@ -210,6 +211,7 @@ plugins = coverage_pyver_pragma [coverage:report] fail_under = 95 +show_missing = True exclude_lines = raise AssertionError raise NotImplementedError From 078db9f9fe4cbe2c34856a776b55e4fc38b5c971 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 23 Aug 2023 08:57:12 +0100 Subject: [PATCH 23/77] Update test_repr_deep from Python 3.12 --- tests/list_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/list_tests.py b/tests/list_tests.py index 5bed3be8..45acf1b0 100644 --- a/tests/list_tests.py +++ b/tests/list_tests.py @@ -76,7 +76,7 @@ def test_repr(self): @not_pypy() def test_repr_deep(self): a = self.type2test([]) - for i in range(sys.getrecursionlimit() + 100): + for i in range(1500 + 1): # sys.getrecursionlimit() + 100 a = self.type2test([a]) with pytest.raises(RecursionError): repr(a) From 576c06733bcd21174aa30adf42cf7aa4fe031bd8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 23 Aug 2023 08:57:44 +0100 Subject: [PATCH 24/77] Don't error on deprecation warnings from pytz --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index daa83de9..79185d73 100644 --- a/tox.ini +++ b/tox.ini @@ -237,7 +237,7 @@ filterwarnings = always:Attribute s is deprecated and will be removed in Python 3.14; use value instead:DeprecationWarning always:ast.Num is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning always:ast.NameConstant is deprecated and will be removed in Python 3.14; use ast.Constant:DeprecationWarning - always:datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning + always:datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning:pytz.tzinfo [testenv] setenv = From f0bd6ec260b2f45b0305499cbd0f4a380f69b999 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 24 Aug 2023 15:32:34 +0100 Subject: [PATCH 25/77] Handle utcnow deprecation --- domdf_python_tools/dates.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/domdf_python_tools/dates.py b/domdf_python_tools/dates.py index 4320ed92..22dc0833 100644 --- a/domdf_python_tools/dates.py +++ b/domdf_python_tools/dates.py @@ -288,7 +288,7 @@ def get_utc_offset( """ if date is None: - date = datetime.datetime.utcnow() + date = datetime.datetime.now(pytz.utc) timezone: Optional[datetime.tzinfo] @@ -313,7 +313,7 @@ def get_timezone(tz: str, date: Optional[datetime.datetime] = None) -> Optional[ """ if date is None: # pragma: no cover (hard to test) - date = datetime.datetime.utcnow() + date = datetime.datetime.now(pytz.utc) d = date.replace(tzinfo=None) From 12dfb66491d30fc891ca674f2f61f1739d4a4398 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Sep 2023 16:26:46 +0100 Subject: [PATCH 26/77] Update for latst PyPy 3.9 --- .../test_iter_submodules_asyncio__3_9_pypy_.yml | 2 -- tox.ini | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_import_tools_/test_iter_submodules_asyncio__3_9_pypy_.yml b/tests/test_import_tools_/test_iter_submodules_asyncio__3_9_pypy_.yml index 5eadfe18..d742bfa1 100644 --- a/tests/test_import_tools_/test_iter_submodules_asyncio__3_9_pypy_.yml +++ b/tests/test_import_tools_/test_iter_submodules_asyncio__3_9_pypy_.yml @@ -4,7 +4,6 @@ - asyncio.base_futures - asyncio.base_subprocess - asyncio.base_tasks -- asyncio.compat - asyncio.constants - asyncio.coroutines - asyncio.events @@ -23,7 +22,6 @@ - asyncio.streams - asyncio.subprocess - asyncio.tasks -- asyncio.test_utils - asyncio.threads - asyncio.transports - asyncio.trsock diff --git a/tox.ini b/tox.ini index 79185d73..5b6e44e5 100644 --- a/tox.ini +++ b/tox.ini @@ -238,6 +238,8 @@ filterwarnings = always:ast.Num is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning always:ast.NameConstant is deprecated and will be removed in Python 3.14; use ast.Constant:DeprecationWarning always:datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning:pytz.tzinfo + always:the imp module is deprecated in favour of importlib:DeprecationWarning + ; Only on PyPy 3.9+, where it's used in a Python test we import [testenv] setenv = From 462fec74a93ff11080ecf08881990932c61a22a7 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 12 Sep 2023 10:48:20 +0100 Subject: [PATCH 27/77] Test on PyPy 3.10 --- .github/workflows/python_ci.yml | 7 ++++--- .github/workflows/python_ci_linux.yml | 7 ++++--- .github/workflows/python_ci_macos.yml | 7 ++++--- repo_helper.yml | 1 + tox.ini | 5 ++++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 8bbb3e00..6c9f1d41 100644 --- 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,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy310' strategy: fail-fast: False @@ -36,9 +36,10 @@ jobs: - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} + - {python-version: "pypy310", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 862d909a..d2b6e70f 100644 --- 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,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy310' strategy: fail-fast: False @@ -37,9 +37,10 @@ jobs: - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12.0-rc.1", testenvs: "py312-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} + - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} + - {python-version: "pypy310", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index e9420ea9..65b12798 100644 --- 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,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy310' strategy: fail-fast: False @@ -35,9 +35,10 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} - - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} + - {python-version: "pypy310", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/repo_helper.yml b/repo_helper.yml index 52e516b8..3294870e 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -31,6 +31,7 @@ python_versions: pypy37: pypy38: pypy39: + pypy310: classifiers: - 'Development Status :: 5 - Production/Stable' diff --git a/tox.ini b/tox.ini index 5b6e44e5..f39b0e72 100644 --- a/tox.ini +++ b/tox.ini @@ -30,6 +30,7 @@ envlist = pypy37 pypy38 pypy39 + pypy310 mypy build skip_missing_interpreters = True @@ -53,6 +54,7 @@ test = pypy37 pypy38 pypy39 + pypy310 qa = mypy, lint cov = py36, coverage @@ -239,7 +241,8 @@ filterwarnings = always:ast.NameConstant is deprecated and will be removed in Python 3.14; use ast.Constant:DeprecationWarning always:datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning:pytz.tzinfo always:the imp module is deprecated in favour of importlib:DeprecationWarning - ; Only on PyPy 3.9+, where it's used in a Python test we import + always:The distutils package is deprecated and slated for removal in Python 3.12:DeprecationWarning + always:The distutils.sysconfig module is deprecated:DeprecationWarning [testenv] setenv = From df005dc8b95fbbcd70bbdeff23a92cf7b2ce1f33 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 12 Sep 2023 11:20:44 +0100 Subject: [PATCH 28/77] Fix PyPy 3.10 version string for GitHub Actions --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 6c9f1d41..84c59fa9 100644 --- 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,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy310' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -39,7 +39,7 @@ jobs: - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} - - {python-version: "pypy310", testenvs: "pypy310,build", experimental: True} + - {python-version: "pypy-3.10", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index d2b6e70f..6e3dbc63 100644 --- 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,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy310' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -40,7 +40,7 @@ jobs: - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} - - {python-version: "pypy310", testenvs: "pypy310,build", experimental: True} + - {python-version: "pypy-3.10", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 65b12798..c936b849 100644 --- 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,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy310' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -38,7 +38,7 @@ jobs: - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} - - {python-version: "pypy310", testenvs: "pypy310,build", experimental: True} + - {python-version: "pypy-3.10", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ From e735a45b9cd06d80216fbaaefab5d6b22ee3b1c4 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 19 Oct 2023 19:04:55 +0100 Subject: [PATCH 29/77] Workaround Python 3.13 removals. So much for the deprecation policy. --- domdf_python_tools/compat/importlib_resources.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/domdf_python_tools/compat/importlib_resources.py b/domdf_python_tools/compat/importlib_resources.py index 087d6717..bc5b5451 100644 --- a/domdf_python_tools/compat/importlib_resources.py +++ b/domdf_python_tools/compat/importlib_resources.py @@ -30,14 +30,14 @@ def _normalize_path(path: Any) -> str: raise ValueError(f'{path!r} must be only a file name') return file_name - def open_binary(package: Package, resource: Resource) -> BinaryIO: + def open_binary(package: "Package", resource: "Resource") -> BinaryIO: """ Return a file-like object opened for binary reading of the resource. """ return (files(package) / _normalize_path(resource)).open("rb") - def read_binary(package: Package, resource: Resource) -> bytes: + def read_binary(package: "Package", resource: "Resource") -> bytes: """ Return the binary contents of the resource. """ @@ -45,8 +45,8 @@ def read_binary(package: Package, resource: Resource) -> bytes: return (files(package) / _normalize_path(resource)).read_bytes() def open_text( - package: Package, - resource: Resource, + package: "Package", + resource: "Resource", encoding: str = "utf-8", errors: str = "strict", ) -> TextIO: @@ -61,8 +61,8 @@ def open_text( ) def read_text( - package: Package, - resource: Resource, + package: "Package", + resource: "Resource", encoding: str = "utf-8", errors: str = "strict", ) -> str: From 35ee049794e4d7124bce67fc3818e1c777f65524 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 20 Oct 2023 09:03:59 +0100 Subject: [PATCH 30/77] Test on Python 3.12 final --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- pyproject.toml | 3 ++- repo_helper.yml | 5 +++-- setup.cfg | 1 + tox.ini | 8 +++++--- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 84c59fa9..5e51dadb 100644 --- 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,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12", testenvs: "py312,build", experimental: False} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 6e3dbc63..243fe850 100644 --- 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,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12", testenvs: "py312,build", experimental: False} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index c936b849..c594b2a4 100644 --- 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,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.9", testenvs: "py39,build", experimental: False} - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev,build", experimental: True} + - {python-version: "3.12", testenvs: "py312,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/pyproject.toml b/pyproject.toml index 39064ddb..8de14cd3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries :: Python Modules", @@ -144,7 +145,7 @@ base-classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11",] +python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",] python-implementations = [ "CPython", "PyPy",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 3294870e..11357873 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -25,8 +25,9 @@ python_versions: 3.9: "3.10": "3.11": - "3.12-dev": - experimental: true + "3.12": +# "3.13-dev": +# experimental: true pypy36: pypy37: pypy38: diff --git a/setup.cfg b/setup.cfg index f78c1878..c78be4d7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,6 +34,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy Topic :: Software Development :: Libraries :: Python Modules diff --git a/tox.ini b/tox.ini index f39b0e72..8077f024 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,9 @@ # * tox # * envlists # * testenv:.package +# * testenv:py313-dev # * testenv:py312-dev +# * testenv:py312 # * testenv:docs # * testenv:build # * testenv:lint @@ -25,7 +27,7 @@ envlist = py39 py310 py311 - py312-dev + py312 pypy36 pypy37 pypy38 @@ -49,7 +51,7 @@ test = py39 py310 py311 - py312-dev + py312 pypy36 pypy37 pypy38 @@ -63,7 +65,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py312-dev] +[testenv:py312] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From 87671cfff678636a9d5e28b782ddfae946ca81ff Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 20 Oct 2023 09:21:15 +0100 Subject: [PATCH 31/77] Bump version v3.6.1 -> v3.7.0 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 928c723b..e43a962d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.6.1 +current_version = 3.7.0 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 5e726931..6178271b 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.6.1=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.7.0=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 331cf740..43ee48a5 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.6.1 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.7.0 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index f31365bd..8a6f1058 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.6.1 + :commits-since: v3.7.0 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 5ba5c15b..76aa226f 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.6.1" +__version__: str = "3.7.0" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index 8de14cd3..f72f41f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.6.1" +version = "3.7.0" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index 11357873..adf9a548 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.6.1" +version: "3.7.0" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index c78be4d7..6ab0f8d8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.6.1 +version = 3.7.0 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From e3b252900b1a5dd98b1036899c178c2f45879f68 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Sun, 10 Dec 2023 22:36:17 +0000 Subject: [PATCH 32/77] Test on Python 3.13 --- .github/workflows/python_ci.yml | 3 ++- .github/workflows/python_ci_linux.yml | 3 ++- .github/workflows/python_ci_macos.yml | 3 ++- repo_helper.yml | 3 +-- tox.ini | 10 +++++++++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 5e51dadb..d56dd6ab 100644 --- 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,3.12,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,6 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} + - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 243fe850..b709cdea 100644 --- 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,3.12,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,6 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} + - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index c594b2a4..742e78f9 100644 --- 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,3.12,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,6 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} + - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/repo_helper.yml b/repo_helper.yml index adf9a548..7d12e414 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -26,8 +26,7 @@ python_versions: "3.10": "3.11": "3.12": -# "3.13-dev": -# experimental: true + "3.13-dev": pypy36: pypy37: pypy38: diff --git a/tox.ini b/tox.ini index 8077f024..4ed5f360 100644 --- a/tox.ini +++ b/tox.ini @@ -28,6 +28,7 @@ envlist = py310 py311 py312 + py313-dev pypy36 pypy37 pypy38 @@ -52,6 +53,7 @@ test = py310 py311 py312 + py313-dev pypy36 pypy37 pypy38 @@ -65,6 +67,11 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 +[testenv:py313-dev] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + [testenv:py312] setenv = PYTHONDEVMODE=1 @@ -89,7 +96,8 @@ changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 - twine>=3.2.0 + twine>=3.2.0; python_version < "3.13" + twine@git+https://github.com/pypa/twine; python_version >= "3.13" cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" From 41781767b3b95e3298c59774e7959ad109e9d01b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Sun, 10 Dec 2023 23:13:00 +0000 Subject: [PATCH 33/77] Add splitlines method to StringList for textwrap.indent --- domdf_python_tools/stringlist.py | 12 ++++++++++++ tests/test_stringlist.py | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/domdf_python_tools/stringlist.py b/domdf_python_tools/stringlist.py index 2f376273..af892096 100644 --- a/domdf_python_tools/stringlist.py +++ b/domdf_python_tools/stringlist.py @@ -463,6 +463,18 @@ def with_indent_type(self, indent_type: str = '\t'): finally: self.indent_type = original_indent_type + def splitlines(self, keepends: bool = False) -> List[str]: + """ + Analagous to :meth:`str.splitlines`. + + .. versionadded:: 3.8.0 + """ + + if keepends: + return [line + '\n' for line in self] + else: + return self + class DelimitedList(List[_S]): """ diff --git a/tests/test_stringlist.py b/tests/test_stringlist.py index 83af8e98..e3b09ad0 100644 --- a/tests/test_stringlist.py +++ b/tests/test_stringlist.py @@ -1,6 +1,8 @@ # stdlib import pickle +import textwrap from textwrap import dedent +from typing import no_type_check # 3rd party import pytest @@ -558,3 +560,11 @@ def test_splitlines(string, lines): @joinlines_splitlines_param def test_joinlines(string, lines): assert string == joinlines(lines) + + +@no_type_check +def test_textwrap_indent(): + sl = StringList(['', '', "hello", "world", '', '', '', "1234"]) + assert textwrap.indent(sl, " ") == "\n\n hello\n world\n\n\n\n 1234\n" + assert textwrap.indent(sl, '\t') == "\n\n\thello\n\tworld\n\n\n\n\t1234\n" + assert textwrap.indent(sl, ">>> ") == "\n\n>>> hello\n>>> world\n\n\n\n>>> 1234\n" From 0be5b5790243901954cdde9192e9a9b254cc20a6 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Sun, 10 Dec 2023 23:23:14 +0000 Subject: [PATCH 34/77] Use Python 3.8 for flake8, mypy etc. --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- tox.ini | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 5b6260e7..8221173d 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -35,7 +35,7 @@ jobs: if: steps.changes.outputs.code == 'true' uses: "actions/setup-python@v4" with: - python-version: "3.6" + python-version: "3.8" - name: Install dependencies πŸ”§ if: steps.changes.outputs.code == 'true' diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 882a62f4..9b28b5f6 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -40,7 +40,7 @@ jobs: if: steps.changes.outputs.code == 'true' uses: "actions/setup-python@v4" with: - python-version: "3.6" + python-version: "3.8" - name: Install dependencies πŸ”§ run: | diff --git a/pyproject.toml b/pyproject.toml index f72f41f0..c17a0c5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -152,7 +152,7 @@ license-key = "MIT" additional-files = [ "include domdf_python_tools/google-10000-english-no-swears.txt",] [tool.mypy] -python_version = "3.6" +python_version = "3.8" namespace_packages = true check_untyped_defs = true warn_unused_ignores = true diff --git a/repo_helper.yml b/repo_helper.yml index 7d12e414..955649a3 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -8,7 +8,7 @@ username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' -python_deploy_version: 3.6 +python_deploy_version: 3.8 requires_python: 3.6 min_coverage: 95 tox_testenv_extras: all diff --git a/tox.ini b/tox.ini index 4ed5f360..5f4dacae 100644 --- a/tox.ini +++ b/tox.ini @@ -60,7 +60,7 @@ test = pypy39 pypy310 qa = mypy, lint -cov = py36, coverage +cov = py38, coverage [testenv:.package] setenv = @@ -105,7 +105,7 @@ commands = check-wheel-contents dist/ [testenv:lint] -basepython = python3.6 +basepython = python3.8 changedir = {toxinidir} ignore_errors = True skip_install = False @@ -135,7 +135,7 @@ deps = commands = python3 -m flake8_rst_docstrings_sphinx domdf_python_tools tests --allow-toolbox {posargs} [testenv:perflint] -basepython = python3.6 +basepython = python3.8 changedir = {toxinidir} ignore_errors = True skip_install = True @@ -143,7 +143,7 @@ deps = perflint commands = python3 -m perflint domdf_python_tools {posargs} [testenv:mypy] -basepython = python3.6 +basepython = python3.8 ignore_errors = True changedir = {toxinidir} extras = all @@ -155,7 +155,7 @@ deps = commands = mypy domdf_python_tools tests {posargs} [testenv:pyup] -basepython = python3.6 +basepython = python3.8 skip_install = True ignore_errors = True changedir = {toxinidir} @@ -164,7 +164,7 @@ extras = all commands = pyup_dirs domdf_python_tools tests --py36-plus --recursive [testenv:coverage] -basepython = python3.6 +basepython = python3.8 skip_install = True ignore_errors = True whitelist_externals = /bin/bash From 3e565be6af09c658ca2f86796e1692d4e04d3a93 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Sun, 10 Dec 2023 23:28:17 +0000 Subject: [PATCH 35/77] Update mypy and linter ignores. --- domdf_python_tools/compat/__init__.py | 6 +++++- domdf_python_tools/stringlist.py | 4 ++-- tests/test_dates.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/domdf_python_tools/compat/__init__.py b/domdf_python_tools/compat/__init__.py index 5d9b3bf8..2571ab3b 100644 --- a/domdf_python_tools/compat/__init__.py +++ b/domdf_python_tools/compat/__init__.py @@ -103,7 +103,11 @@ "PYPY39_PLUS", ] -if sys.version_info[:2] < (3, 7) or domdf_python_tools.__docs or TYPE_CHECKING: # pragma: no cover (py37+) +if TYPE_CHECKING: # pragma: no cover + # stdlib + from contextlib import nullcontext + +elif sys.version_info[:2] < (3, 7) or domdf_python_tools.__docs: # pragma: no cover (py37+) _T = TypeVar("_T") diff --git a/domdf_python_tools/stringlist.py b/domdf_python_tools/stringlist.py index af892096..4b0c173a 100644 --- a/domdf_python_tools/stringlist.py +++ b/domdf_python_tools/stringlist.py @@ -79,7 +79,7 @@ def size(self) -> int: def size(self, size: int) -> None: self._size = int(size) - @property # noqa: A003 # pylint: disable=redefined-builtin + @property def type(self) -> str: """ The indent character. @@ -87,7 +87,7 @@ def type(self) -> str: return self._type - @type.setter # noqa: A003 # pylint: disable=redefined-builtin + @type.setter def type(self, type: str) -> None: # noqa: A002 # pylint: disable=redefined-builtin if not str(type): raise ValueError("'type' cannot an empty string.") diff --git a/tests/test_dates.py b/tests/test_dates.py index 0dc77c31..df5d7764 100644 --- a/tests/test_dates.py +++ b/tests/test_dates.py @@ -198,7 +198,7 @@ def test_utc_offset_no_pytz(): # ): # # # this package -# from domdf_python_tools.dates import get_utc_offset # noqa: F401 +# from domdf_python_tools.dates import get_utc_offset @pytest.mark.parametrize("month_idx, month", enumerate(dates.month_full_names)) From ea7273a2ee403ba8cf5e14c132db206c8f425c72 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 09:28:29 +0000 Subject: [PATCH 36/77] Update test_sphinxify_docstring for Python 3.13 --- tests/test_doctools.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/test_doctools.py b/tests/test_doctools.py index c47cd2fa..55358b41 100644 --- a/tests/test_doctools.py +++ b/tests/test_doctools.py @@ -8,6 +8,7 @@ # stdlib import math +import sys from typing import Iterable, NamedTuple, get_type_hints # 3rd party @@ -353,7 +354,16 @@ def demo_function(): return math.pi - assert demo_function.__doc__ == """ + if sys.version_info >= (3, 13): + assert demo_function.__doc__ == """ +This is a docstring that contains references to :class:`str`, :class:`int`, and :class:`float` +but lacks proper references to them when rendered in Sphinx. + +:return: pi +:rtype: float +""" + else: + assert demo_function.__doc__ == """ This is a docstring that contains references to :class:`str`, :class:`int`, and :class:`float` but lacks proper references to them when rendered in Sphinx. From 4f8c306939cb7e135b3d778618a326610ac32818 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 09:29:28 +0000 Subject: [PATCH 37/77] Remove unused type: ignore comments --- domdf_python_tools/paths.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/domdf_python_tools/paths.py b/domdf_python_tools/paths.py index 23e1866f..1f298525 100644 --- a/domdf_python_tools/paths.py +++ b/domdf_python_tools/paths.py @@ -736,7 +736,7 @@ def is_mount(self) -> bool: if sys.version_info < (3, 8): # pragma: no cover (py38+) - def rename(self: _P, target: Union[str, pathlib.PurePath]) -> _P: # type: ignore + def rename(self: _P, target: Union[str, pathlib.PurePath]) -> _P: """ Rename this path to the target path. @@ -755,7 +755,7 @@ def rename(self: _P, target: Union[str, pathlib.PurePath]) -> _P: # type: ignor os.rename(self, target) return self.__class__(target) - def replace(self: _P, target: Union[str, pathlib.PurePath]) -> _P: # type: ignore + def replace(self: _P, target: Union[str, pathlib.PurePath]) -> _P: """ Rename this path to the target path, overwriting if that path exists. From 185f1c0caf645d7b8678ecea6a80f937f6c72ed0 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 10:14:30 +0000 Subject: [PATCH 38/77] Increase test coverage in stringlist module. --- tests/test_stringlist.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/test_stringlist.py b/tests/test_stringlist.py index e3b09ad0..42e95b3e 100644 --- a/tests/test_stringlist.py +++ b/tests/test_stringlist.py @@ -82,6 +82,9 @@ def test_setitem(self): sl[3:4] = "\nfoo\nbar\n", "baz" assert sl == ["foo", "bar", '', '', "foo", "bar", '', "baz", '', "world", '', '', '', "1234"] + sl[3:5] = iter(["foo", "bar", "baz"]) + assert sl == ["foo", "bar", '', "foo", "bar", "baz", '', "baz", '', "world", '', '', '', "1234"] + def test_blankline(self): sl = StringList(['', '', "hello", "world", '', '', '', "1234"]) @@ -563,8 +566,15 @@ def test_joinlines(string, lines): @no_type_check -def test_textwrap_indent(): +def test_stringlist_textwrap_indent(): sl = StringList(['', '', "hello", "world", '', '', '', "1234"]) assert textwrap.indent(sl, " ") == "\n\n hello\n world\n\n\n\n 1234\n" assert textwrap.indent(sl, '\t') == "\n\n\thello\n\tworld\n\n\n\n\t1234\n" assert textwrap.indent(sl, ">>> ") == "\n\n>>> hello\n>>> world\n\n\n\n>>> 1234\n" + + +def test_stringlist_splitlines(): + sl = StringList(['', '', "hello", "world", '', '', '', "1234"]) + assert sl.splitlines() is sl + assert list(sl.splitlines()) == ['', '', "hello", "world", '', '', '', "1234"] + assert sl.splitlines(keepends=True) == ['\n', '\n', "hello\n", "world\n", '\n', '\n', '\n', "1234\n"] From 3e189a571f33367df2bfa45973079d8907e13bf1 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 10:30:37 +0000 Subject: [PATCH 39/77] Bump version v3.7.0 -> v3.8.0 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e43a962d..88a7e48b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.0 +current_version = 3.8.0 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 6178271b..9bc5ba92 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.7.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.0=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 43ee48a5..092f9d78 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.7.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.0 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index 8a6f1058..c3780f87 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.7.0 + :commits-since: v3.8.0 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 76aa226f..0bf8b75c 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.7.0" +__version__: str = "3.8.0" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index c17a0c5d..a51dbe6f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.7.0" +version = "3.8.0" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index 955649a3..b532bd2b 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.7.0" +version: "3.8.0" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index 6ab0f8d8..a5ec6590 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.7.0 +version = 3.8.0 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From 22d8958a79533cdf6590265239559d9957549dce Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 11:55:50 +0000 Subject: [PATCH 40/77] Remove jinja2 cap from doc-source/requirements.txt --- doc-source/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 67155704..394a9bab 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -2,7 +2,6 @@ default-values>=0.6.0 domdf-sphinx-theme>=0.3.0 extras-require>=0.5.0 html-section>=0.3.0 -jinja2<3.1 pandas>=1.1.2 pytest>=6.2.0 pytest-regressions>=2.0.2 From 383ccacedec5cf2ab89d40bfe910b5c29847b014 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 14:44:43 +0000 Subject: [PATCH 41/77] Bump version v3.8.0 -> v3.8.0.post1 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 88a7e48b..e7d72ce8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.8.0 +current_version = 3.8.0.post1 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 9bc5ba92..109185e2 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.0.post1=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 092f9d78..08c47a66 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.0.post1 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index c3780f87..edf531d1 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.8.0 + :commits-since: v3.8.0.post1 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 0bf8b75c..0c53347f 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.8.0" +__version__: str = "3.8.0.post1" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index a51dbe6f..2900c05c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.8.0" +version = "3.8.0.post1" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index b532bd2b..48299158 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.8.0" +version: "3.8.0.post1" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index a5ec6590..b6bd0b6a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.8.0 +version = 3.8.0.post1 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From 148beb512a9d6c18d497e22e60854b6a8482ff7b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 15:38:33 +0000 Subject: [PATCH 42/77] Update reference files for latest consolekit --- .../test_iter_submodules_consolekit_3_10_.yml | 2 ++ .../test_import_tools_/test_iter_submodules_consolekit_3_6_.yml | 2 ++ .../test_import_tools_/test_iter_submodules_consolekit_3_7_.yml | 2 ++ .../test_iter_submodules_consolekit_3_7_pypy_.yml | 2 ++ .../test_import_tools_/test_iter_submodules_consolekit_3_8_.yml | 2 ++ .../test_iter_submodules_consolekit_3_8_pypy_.yml | 2 ++ .../test_import_tools_/test_iter_submodules_consolekit_3_9_.yml | 2 ++ .../test_iter_submodules_consolekit_3_9_pypy_.yml | 2 ++ 8 files changed, 16 insertions(+) diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_10_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_10_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_10_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_10_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_6_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_6_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_6_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_6_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_pypy_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_pypy_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_pypy_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_7_pypy_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_pypy_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_pypy_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_pypy_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_8_pypy_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions diff --git a/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_pypy_.yml b/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_pypy_.yml index c571a184..a20a9ba3 100644 --- a/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_pypy_.yml +++ b/tests/test_import_tools_/test_iter_submodules_consolekit_3_9_pypy_.yml @@ -1,4 +1,5 @@ - consolekit +- consolekit._readline - consolekit._types - consolekit.commands - consolekit.input @@ -7,3 +8,4 @@ - consolekit.testing - consolekit.tracebacks - consolekit.utils +- consolekit.versions From 844c456bd1c7598a563f269d65ec1f60c66a0b96 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 11 Dec 2023 16:07:08 +0000 Subject: [PATCH 43/77] Bump version v3.8.0.post1 -> v3.8.0.post2 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e7d72ce8..5f6db16a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.8.0.post1 +current_version = 3.8.0.post2 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 109185e2..e4df9acc 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.0.post1=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.0.post2=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 08c47a66..4222e88b 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.0.post1 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.0.post2 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index edf531d1..bd42a60c 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.8.0.post1 + :commits-since: v3.8.0.post2 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 0c53347f..8f398058 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.8.0.post1" +__version__: str = "3.8.0.post2" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index 2900c05c..520c3991 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.8.0.post1" +version = "3.8.0.post2" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index 48299158..fd75732b 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.8.0.post1" +version: "3.8.0.post2" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index b6bd0b6a..26c97a00 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.8.0.post1 +version = 3.8.0.post2 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From ad69a0e6a4d0709e3d5d19e4b276ca03eb073df3 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 07:53:21 +0000 Subject: [PATCH 44/77] Updated files with 'repo_helper'. (#105) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- .readthedocs.yml | 3 +++ README.rst | 2 +- doc-source/index.rst | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index e4df9acc..39827294 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -30,7 +30,7 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.23.3 + conda-build-version: 3.28.4 python-version: "3.8" miniforge-variant: Mambaforge diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index b709cdea..8fa5f343 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -195,7 +195,7 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.23.3 + conda-build-version: 3.28.4 python-version: "3.8" miniforge-variant: Mambaforge diff --git a/.readthedocs.yml b/.readthedocs.yml index 615e8643..35b5c858 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -19,3 +19,6 @@ build: jobs: post_create_environment: - pip install .[all] + post_install: + - pip install sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.1 + sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 diff --git a/README.rst b/README.rst index 4222e88b..ce7b6f46 100644 --- a/README.rst +++ b/README.rst @@ -108,7 +108,7 @@ domdf_python_tools :target: https://github.com/domdfcoding/domdf_python_tools/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2023 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/domdf_python_tools diff --git a/doc-source/index.rst b/doc-source/index.rst index bd42a60c..ee006f0d 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -115,7 +115,7 @@ domdf_python_tools :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2023 + .. |maintained| maintained-shield:: 2024 :alt: Maintenance .. |pypi-downloads| pypi-shield:: From b00a777e230894f7359e5f5b9816be8d3ed03ed5 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:50:33 +0000 Subject: [PATCH 45/77] Updated files with 'repo_helper'. (#109) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 4 ++-- .github/workflows/docs_test_action.yml | 2 +- .github/workflows/flake8.yml | 4 ++-- .github/workflows/mypy.yml | 4 ++-- .github/workflows/python_ci.yml | 8 ++++---- .github/workflows/python_ci_linux.yml | 20 ++++++++++---------- .github/workflows/python_ci_macos.yml | 8 ++++---- .pre-commit-config.yaml | 12 ++++++------ 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 39827294..ffbfaaf0 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index b09bde34..8f60ba5a 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 8221173d..0a8c0c3e 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -33,7 +33,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 9b28b5f6..10c6f300 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -38,7 +38,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index d56dd6ab..caf64b90 100644 --- 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,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -59,7 +59,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 8fa5f343..e608e737 100644 --- 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,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -60,7 +60,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" @@ -90,10 +90,10 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: 3.8 @@ -139,11 +139,11 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" if: startsWith(github.ref, 'refs/tags/') - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" if: startsWith(github.ref, 'refs/tags/') with: python-version: 3.8 @@ -184,10 +184,10 @@ jobs: if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true) steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: 3.8 diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 742e78f9..aa82f486 100644 --- 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,3.12,3.13.0-alpha.2,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout πŸ›ŽοΈ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -58,7 +58,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 73f81d41..dea309e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.0 + rev: v0.9.1 hooks: - id: reformat-pyproject @@ -43,13 +43,13 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.0 + rev: v0.3.1 hooks: - id: ensure-dunder-all files: ^domdf_python_tools/.*\.py$ - repo: https://github.com/domdfcoding/flake2lint - rev: v0.4.2 + rev: v0.4.3 hooks: - id: flake2lint @@ -76,18 +76,18 @@ repos: - id: forbid-crlf - repo: https://github.com/python-formate/snippet-fmt - rev: v0.1.4 + rev: v0.1.5 hooks: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.5.0 + rev: v0.7.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.7.1 + rev: v0.8.0 hooks: - id: dep_checker args: From 33538a2c0b0dbd65d3474f8c92d2e86b2f826726 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:21:01 +0000 Subject: [PATCH 46/77] Updated files with 'repo_helper'. (#110) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 6 +++--- .github/workflows/python_ci_linux.yml | 10 +++++----- .github/workflows/python_ci_macos.yml | 6 +++--- formate.toml | 2 +- tox.ini | 3 +-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index caf64b90..436a1524 100644 --- 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,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} @@ -76,7 +76,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage πŸš€" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index e608e737..d676b3fa 100644 --- 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,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} @@ -78,7 +78,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage πŸš€" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" @@ -103,7 +103,7 @@ jobs: python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma - name: "Download Coverage πŸͺ‚" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: coverage @@ -121,7 +121,7 @@ jobs: - name: "Upload Combined Coverage Artefact πŸš€" if: ${{ steps.show.outcome != 'failure' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "combined-coverage" path: .coverage diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index aa82f486..6c52eed8 100644 --- 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,3.12,3.13.0-alpha.3,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} @@ -75,7 +75,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage πŸš€" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/formate.toml b/formate.toml index b6364ffa..77cf2cc7 100644 --- a/formate.toml +++ b/formate.toml @@ -56,4 +56,4 @@ known_third_party = [ "requests", "typing_extensions", ] -known_first_party = "domdf_python_tools" +known_first_party = [ "domdf_python_tools",] diff --git a/tox.ini b/tox.ini index 5f4dacae..fd2a66c9 100644 --- a/tox.ini +++ b/tox.ini @@ -96,8 +96,7 @@ changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 - twine>=3.2.0; python_version < "3.13" - twine@git+https://github.com/pypa/twine; python_version >= "3.13" + twine>=3.2.0 cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" From c7a949aa27967d638c68d3a0be6bb270772e1fe6 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 18 Mar 2024 16:33:00 +0000 Subject: [PATCH 47/77] Remove keyword from pytest.fail call --- tests/test_docstrings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_docstrings.py b/tests/test_docstrings.py index f67adaea..049a1965 100644 --- a/tests/test_docstrings.py +++ b/tests/test_docstrings.py @@ -39,4 +39,4 @@ def test_docstrings(module): print(indent(stdout.getvalue(), " ")) if runner.failures: - pytest.fail(msg=f"{runner.failures} tests failed") + pytest.fail(f"{runner.failures} tests failed") From 074a5af274b4f8b441fe6639982d98b473932455 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 16:43:47 +0000 Subject: [PATCH 48/77] [repo-helper] Configuration Update (#111) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .dependabot/config.yml | 9 --------- .github/dependabot.yml | 1 + .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 .dependabot/config.yml diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index 45849245..00000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,9 +0,0 @@ -# This file is managed by 'repo_helper'. Don't edit it directly. ---- -version: 1 -update_configs: -- package_manager: python - directory: / - update_schedule: weekly - default_reviewers: - - domdfcoding diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e769ad3a..454225a2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,5 +6,6 @@ updates: directory: / schedule: interval: weekly + open-pull-requests-limit: 0 reviewers: - domdfcoding diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 436a1524..91cb98c9 100644 --- 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,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index d676b3fa..4f392a9a 100644 --- 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,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 6c52eed8..e2529fa9 100644 --- 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,3.12,3.13.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} From 83049478c59ef09cb427691a4ef6b1cb113e91dd Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 22:46:29 +0100 Subject: [PATCH 49/77] [repo-helper] Configuration Update (#112) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index fd2a66c9..f31ae951 100644 --- a/tox.ini +++ b/tox.ini @@ -118,7 +118,7 @@ deps = flake8-github-actions>=0.1.0 flake8-noqa>=1.1.0,<=1.2.2 flake8-pyi>=20.10.0,<=22.8.0 - flake8-pytest-style>=1.3.0 + flake8-pytest-style>=1.3.0,<2 flake8-quotes>=3.3.0 flake8-slots>=0.1.0 flake8-sphinx-links>=0.0.4 @@ -228,8 +228,8 @@ exclude_lines = raise NotImplementedError if 0: if False: - if TYPE_CHECKING: - if typing.TYPE_CHECKING: + if TYPE_CHECKING + if typing.TYPE_CHECKING if __name__ == .__main__.: [check-wheel-contents] From adce67be02089dad3717ab1d9fedc3114a47ae6a Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:52:16 +0100 Subject: [PATCH 50/77] [repo-helper] Configuration Update (#115) * Updated files with 'repo_helper'. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- doc-source/conf.py | 6 ++++++ formate.toml | 16 ++++++++-------- pyproject.toml | 29 +++++++++++++---------------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dea309e7..e7d384bd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.1 + rev: v0.11.0 hooks: - id: reformat-pyproject diff --git a/doc-source/conf.py b/doc-source/conf.py index 959b96d9..69f65945 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -78,8 +78,14 @@ def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout + from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) + app.connect("build-finished", sphinxemoji.copy_asset_files) + app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") + app.add_js_file("twemoji.js") + app.add_css_file("twemoji.css") + app.add_transform(sphinxemoji.EmojiSubstitutions) manpages_url = "https://manpages.debian.org/{path}" diff --git a/formate.toml b/formate.toml index 77cf2cc7..95093bce 100644 --- a/formate.toml +++ b/formate.toml @@ -6,21 +6,17 @@ noqa-reformat = 60 ellipsis-reformat = 70 squish_stubs = 80 -[config] -indent = "\t" -line_length = 115 - [hooks.yapf] priority = 30 -[hooks.isort] -priority = 50 - [hooks.yapf.kwargs] yapf_style = ".style.yapf" +[hooks.isort] +priority = 50 + [hooks.isort.kwargs] -indent = "\t\t" +indent = " " multi_line_output = 8 import_heading_stdlib = "stdlib" import_heading_thirdparty = "3rd party" @@ -57,3 +53,7 @@ known_third_party = [ "typing_extensions", ] known_first_party = [ "domdf_python_tools",] + +[config] +indent = " " +line_length = 115 diff --git a/pyproject.toml b/pyproject.toml index 520c3991..6d47416f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,14 +30,13 @@ classifiers = [ ] dynamic = [ "dependencies",] +[project.license] +file = "LICENSE" + [[project.authors]] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" - -[project.license] -file = "LICENSE" - [project.urls] Homepage = "https://github.com/domdfcoding/domdf_python_tools" "Issue Tracker" = "https://github.com/domdfcoding/domdf_python_tools/issues" @@ -75,7 +74,6 @@ extensions = [ "sphinx.ext.mathjax", "sphinxcontrib.extras_require", "sphinx.ext.todo", - "sphinxemoji.sphinxemoji", "notfound.extension", "sphinx_copybutton", "sphinxcontrib.default_values", @@ -89,7 +87,6 @@ extensions = [ "sphinx_toolbox.latex.succinct_seealso", "latex_unicode", ] -sphinxemoji_style = "twemoji" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] @@ -162,6 +159,16 @@ show_error_codes = true [tool.snippet-fmt] directives = [ "code-block",] +[tool.snippet-fmt.languages.python] +reformat = true + +[tool.snippet-fmt.languages.TOML] +reformat = true + +[tool.snippet-fmt.languages.ini] + +[tool.snippet-fmt.languages.json] + [tool.setuptools] zip-safe = false include-package-data = true @@ -177,13 +184,3 @@ include = false [tool.dependency-dash."doc-source/requirements.txt"] order = 30 include = false - -[tool.snippet-fmt.languages.python] -reformat = true - -[tool.snippet-fmt.languages.TOML] -reformat = true - -[tool.snippet-fmt.languages.ini] - -[tool.snippet-fmt.languages.json] From e075869a02f2ded56d017c722765340a002f0345 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:59:21 +0100 Subject: [PATCH 51/77] Bump Python 3.13 alpha (#116) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 91cb98c9..88be8ad4 100644 --- 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,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 4f392a9a..93b9e927 100644 --- 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,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index e2529fa9..e75b4449 100644 --- 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,3.12,3.13.0-alpha.5,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} From a814f8a9713d831280e249fceffe747fa5782c91 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 26 Apr 2024 09:58:35 +0100 Subject: [PATCH 52/77] Drop natsort-stubs as natsort has type hints itself --- stubs.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/stubs.txt b/stubs.txt index c181ed15..2471af61 100644 --- a/stubs.txt +++ b/stubs.txt @@ -1,4 +1,3 @@ -git+https://github.com/domdfcoding/natsort-stubs pandas-stubs; implementation_name == "cpython" and python_version < "3.10" types-click types-pytz From f4b8bff43cb46b79e98041bae6b5f1a2a2e94db0 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 26 Apr 2024 10:38:03 +0100 Subject: [PATCH 53/77] Skip test_repr_deep on newer Pythons where it doesn't error --- tests/list_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/list_tests.py b/tests/list_tests.py index 45acf1b0..2c6f7050 100644 --- a/tests/list_tests.py +++ b/tests/list_tests.py @@ -74,6 +74,7 @@ def test_repr(self): assert repr(a2) == "[0, 1, 2, [...], 3]" @not_pypy() + @pytest.mark.skipif(sys.version_info >= (3, 12), reason="Doesn't error on newer Pythons") def test_repr_deep(self): a = self.type2test([]) for i in range(1500 + 1): # sys.getrecursionlimit() + 100 From d3d2cde00e0456769012b5e9af0352a7c5c301df Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 10:57:12 +0100 Subject: [PATCH 54/77] Updated files with 'repo_helper'. (#117) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 2 +- tox.ini | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index e75b4449..1a9dfb58 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-latest / Python ${{ matrix.config.python-version }}" - runs-on: "macos-latest" + name: "macos-13 / Python ${{ matrix.config.python-version }}" + runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e7d384bd..c190c3e4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.1 + rev: v0.4.1 hooks: - id: ensure-dunder-all files: ^domdf_python_tools/.*\.py$ diff --git a/tox.ini b/tox.ini index f31ae951..c5e10f0b 100644 --- a/tox.ini +++ b/tox.ini @@ -91,6 +91,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 PIP_PREFER_BINARY=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 skip_install = True changedir = {toxinidir} deps = From 1836bf85098ad1a95ae693abb8bbb20cca1400df Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 16:21:23 +0100 Subject: [PATCH 55/77] [repo-helper] Configuration Update (#118) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- tox.ini | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 88be8ad4..1d42a4fe 100644 --- 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,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 93b9e927..8cc93b4e 100644 --- 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,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 1a9dfb58..23cb8ffb 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/tox.ini b/tox.ini index c5e10f0b..0d705a96 100644 --- a/tox.ini +++ b/tox.ini @@ -71,6 +71,7 @@ setenv = setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] setenv = From 094de5f9e56eca94ecbfee097957b957d1c9939f Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 17:36:02 +0100 Subject: [PATCH 56/77] Updated files with 'repo_helper'. (#121) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index ffbfaaf0..282241ff 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -39,7 +39,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.*,<=67.1.0,>=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 8cc93b4e..172d5da4 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -204,7 +204,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.*,<=67.1.0,>=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/pyproject.toml b/pyproject.toml index 6d47416f..d00d4464 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.*,<=67.1.0,>=40.6.0", "wheel>=0.34.2",] build-backend = "setuptools.build_meta" [project] From d17cc361f68c8625c713535be73184328f60d05e Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 20 May 2024 17:39:47 +0100 Subject: [PATCH 57/77] Bump version v3.8.0.post2 -> v3.8.1 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5f6db16a..731b1e33 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.8.0.post2 +current_version = 3.8.1 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 282241ff..2ecad456 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.0.post2=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.1=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index ce7b6f46..c2304559 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.0.post2 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.1 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index ee006f0d..e6dd5ab4 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.8.0.post2 + :commits-since: v3.8.1 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 8f398058..6a49ebaf 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.8.0.post2" +__version__: str = "3.8.1" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index d00d4464..f8b41c3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.8.0.post2" +version = "3.8.1" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index fd75732b..796f4256 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.8.0.post2" +version: "3.8.1" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index 26c97a00..a7f3f8d9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.8.0.post2 +version = 3.8.1 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From dab1f3b20646ccb4f944f402099e02ea1058b7b6 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 17 Jun 2024 15:12:28 +0100 Subject: [PATCH 58/77] Update test_printt for Python 3.13 --- tests/test_utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index 7ef7c8c3..768bd836 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -124,11 +124,17 @@ def test_printr(obj, expects, capsys): assert re.match(expects, stdout[0]) +if sys.version_info >= (3, 13): + pure_posix_path_expected = "" +else: + pure_posix_path_expected = "" + + @pytest.mark.parametrize( "obj, expects", [ ("This is a test", ""), - (pathlib.PurePosixPath("foo.txt"), ""), + (pathlib.PurePosixPath("foo.txt"), pure_posix_path_expected), (1234, ""), (12.34, ""), (CustomRepr(), ""), From 4a1a5ef3138576eddbc4e214de47a36e307b31de Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:36:43 +0100 Subject: [PATCH 59/77] Updated files with 'repo_helper'. (#123) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 8 ++++---- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 1d42a4fe..245fcedb 100644 --- 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,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,12 +35,12 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} - - {python-version: "pypy-3.10", testenvs: "pypy310,build", experimental: True} + - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39,build", experimental: True} + - {python-version: "pypy-3.10-v7.3.15", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 172d5da4..3bf210ac 100644 --- 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,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 23cb8ffb..6c89fac5 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} From 953bce6de98eb0073eaf27df8afbb60bd7699b82 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 09:59:54 +0100 Subject: [PATCH 60/77] Pin conda versions in GHA. (#124) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 7 ++++--- .github/workflows/python_ci_linux.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 2ecad456..c4d3c959 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -24,14 +24,15 @@ jobs: - name: Setup Python 🐍 uses: "actions/setup-python@v5" with: - python-version: "3.8" + python-version: "3.11" - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v2.1.1 with: activate-environment: env conda-build-version: 3.28.4 - python-version: "3.8" + miniconda-version: py311_24.1.2-0 + python-version: "3.11" miniforge-variant: Mambaforge - name: Install dependencies πŸ”§ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 3bf210ac..975c26a0 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -189,14 +189,15 @@ jobs: - name: Setup Python 🐍 uses: "actions/setup-python@v5" with: - python-version: 3.8 + python-version: 3.11 - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v2.1.1 with: activate-environment: env conda-build-version: 3.28.4 - python-version: "3.8" + miniconda-version: py311_24.1.2-0 + python-version: "3.11" miniforge-variant: Mambaforge - name: Install dependencies πŸ”§ From c313d010bcddf784e48033d1573400187b39e98f Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 27 Jun 2024 13:53:23 +0100 Subject: [PATCH 61/77] Add wine's dosdevices directory to default for exclude_dirs --- domdf_python_tools/paths.py | 1 + 1 file changed, 1 insertion(+) diff --git a/domdf_python_tools/paths.py b/domdf_python_tools/paths.py index 1f298525..f7c6b7b3 100644 --- a/domdf_python_tools/paths.py +++ b/domdf_python_tools/paths.py @@ -130,6 +130,7 @@ ".tox4", ".nox", "__pypackages__", + "dosdevices", ) """ A list of directories which will likely be unwanted when searching directory trees for files. From e2784d40f8c90c056e87bc614a264ab6a537cd98 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 27 Jun 2024 16:34:04 +0100 Subject: [PATCH 62/77] Use importlib_resources on Python 3.7 and 3.8 --- domdf_python_tools/compat/importlib_resources.py | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/domdf_python_tools/compat/importlib_resources.py b/domdf_python_tools/compat/importlib_resources.py index bc5b5451..f7b66d4d 100644 --- a/domdf_python_tools/compat/importlib_resources.py +++ b/domdf_python_tools/compat/importlib_resources.py @@ -5,7 +5,7 @@ import sys from typing import Any, BinaryIO, TextIO -if sys.version_info[:2] < (3, 7): # pragma: no cover (py37+) +if sys.version_info[:2] < (3, 9): # pragma: no cover (py37+) # 3rd party import importlib_resources @@ -16,7 +16,7 @@ import importlib.resources globals().update(importlib.resources.__dict__) -if not ((3, 7) <= sys.version_info < (3, 11)): # pragma: no cover (py37 OR py38 OR py39 OR py310): +if not ((3, 9) <= sys.version_info < (3, 11)): # pragma: no cover (py39 OR py310): def _normalize_path(path: Any) -> str: """ diff --git a/requirements.txt b/requirements.txt index f228c8da..d38fb0b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ importlib-metadata>=3.6.0; python_version < "3.9" -importlib-resources>=3.0.0; python_version < "3.7" +importlib-resources>=3.0.0; python_version < "3.9" natsort>=7.0.1 typing-extensions>=3.7.4.1 From 4a5e092a6f1010dc7ec0d26bd39261008c7030a9 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 28 Jun 2024 10:37:47 +0100 Subject: [PATCH 63/77] Bump version v3.8.1 -> v3.9.0 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- domdf_python_tools/compat/importlib_resources.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- setup.cfg | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 731b1e33..54ba5f3e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.8.1 +current_version = 3.9.0 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index c4d3c959..e2b27e85 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -58,7 +58,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.8.1=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.9.0=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index c2304559..f9568ac5 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.8.1 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.9.0 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index e6dd5ab4..768a8a8d 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.8.1 + :commits-since: v3.9.0 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index 6a49ebaf..e9de6e49 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.8.1" +__version__: str = "3.9.0" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/domdf_python_tools/compat/importlib_resources.py b/domdf_python_tools/compat/importlib_resources.py index f7b66d4d..cefee9fb 100644 --- a/domdf_python_tools/compat/importlib_resources.py +++ b/domdf_python_tools/compat/importlib_resources.py @@ -5,7 +5,7 @@ import sys from typing import Any, BinaryIO, TextIO -if sys.version_info[:2] < (3, 9): # pragma: no cover (py37+) +if sys.version_info[:2] < (3, 9): # pragma: no cover (py39+) # 3rd party import importlib_resources diff --git a/pyproject.toml b/pyproject.toml index f8b41c3f..a77e98fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "domdf_python_tools" -version = "3.8.1" +version = "3.9.0" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index 796f4256..9ce60b66 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.8.1" +version: "3.9.0" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' diff --git a/setup.cfg b/setup.cfg index a7f3f8d9..4f883f97 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = domdf_python_tools -version = 3.8.1 +version = 3.9.0 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License From 3ab978f7775517f5a35a0c439f10deb8a93266a1 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:51:29 +0100 Subject: [PATCH 64/77] Updated files with 'repo_helper'. (#125) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- doc-source/conf.py | 17 ++++++++++++++++- doc-source/requirements.txt | 6 ++++++ 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 245fcedb..cfaf179b 100644 --- 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,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 975c26a0..827f8e7f 100644 --- 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,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 6c89fac5..e6fc6b68 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/doc-source/conf.py b/doc-source/conf.py index 69f65945..2cca2611 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -75,13 +75,28 @@ } +# Fix for pathlib issue with sphinxemoji on Python 3.9 and Sphinx 4.x +def copy_asset_files(app, exc): + # 3rd party + from domdf_python_tools.compat import importlib_resources + from sphinx.util.fileutil import copy_asset + + if exc: + return + + asset_files = ["twemoji.js", "twemoji.css"] + for path in asset_files: + path_str = os.fspath(importlib_resources.files("sphinxemoji") / path) + copy_asset(path_str, os.path.join(app.outdir, "_static")) + + def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) - app.connect("build-finished", sphinxemoji.copy_asset_files) + app.connect("build-finished", copy_asset_files) app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") app.add_js_file("twemoji.js") app.add_css_file("twemoji.css") diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 394a9bab..06459eac 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -18,6 +18,12 @@ sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 sphinx-tabs>=1.1.13 sphinx-toolbox>=3.5.0 +sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-httpdomain>=1.7.0 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.5 sphinxemoji>=0.1.6 toctree-plus>=0.6.1 From 72117079d9297bf6ac56dc3f5e11303f522680e7 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 12:32:39 +0100 Subject: [PATCH 65/77] [repo-helper] Configuration Update (#126) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- doc-source/requirements.txt | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index cfaf179b..fefeeb60 100644 --- 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,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 827f8e7f..fb27d938 100644 --- 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,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index e6fc6b68..0a6e7c4c 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 06459eac..254a6964 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -14,9 +14,7 @@ sphinx-debuginfo>=0.2.2 sphinx-highlights>=0.1.0 sphinx-licenseinfo>=0.3.1 sphinx-notfound-page>=0.7.1 -sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 -sphinx-tabs>=1.1.13 sphinx-toolbox>=3.5.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 From 6e3b6ed9bd33fd44c6bbffac4c504d3857b02541 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:33:23 +0100 Subject: [PATCH 66/77] Bump Python 3.13 prerelease (#127) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index fefeeb60..365051d6 100644 --- 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,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index fb27d938..77bbefb4 100644 --- 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,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 0a6e7c4c..0c332fe1 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} From 1a87906e6e9f00f61bb792371146143efce45b7e Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:55:37 +0100 Subject: [PATCH 67/77] Updated files with 'repo_helper'. (#128) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 6 +++--- tox.ini | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 365051d6..4505aef6 100644 --- 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,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 77bbefb4..3ff26923 100644 --- 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,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 0c332fe1..d008b4ea 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c190c3e4..15d1d860 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.0 + rev: v0.11.1 hooks: - id: reformat-pyproject @@ -42,7 +42,7 @@ repos: exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$ - id: bind-requirements - - repo: https://github.com/domdfcoding/flake8-dunder-all + - repo: https://github.com/python-formate/flake8-dunder-all rev: v0.4.1 hooks: - id: ensure-dunder-all @@ -86,7 +86,7 @@ repos: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - - repo: https://github.com/domdfcoding/dep_checker + - repo: https://github.com/python-coincidence/dep_checker rev: v0.8.0 hooks: - id: dep_checker diff --git a/tox.ini b/tox.ini index 0d705a96..8e920f9c 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ # * envlists # * testenv:.package # * testenv:py313-dev +# * testenv:py313 # * testenv:py312-dev # * testenv:py312 # * testenv:docs @@ -68,12 +69,14 @@ setenv = PIP_DISABLE_PIP_VERSION_CHECK=1 [testenv:py313-dev] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From f325b6eb4296c2c8820b1011912cb74ab05cec3e Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 11 Feb 2025 10:49:52 +0000 Subject: [PATCH 68/77] Switch build backend to hatch --- .bumpversion.cfg | 4 ---- .github/workflows/conda_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- MANIFEST.in | 7 ------- pyproject.toml | 23 +++++++++++++++++++++-- repo_helper.yml | 1 + 6 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 MANIFEST.in diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 54ba5f3e..652466ae 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -19,10 +19,6 @@ replace = : str = "{new_version}" search = version = "{current_version}" replace = version = "{new_version}" -[bumpversion:file:setup.cfg] -search = version = {current_version} -replace = version = {new_version} - [bumpversion:file:.github/workflows/conda_ci.yml] search = ={current_version}=py_1 replace = ={new_version}=py_1 diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index e2b27e85..d044acaf 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -40,7 +40,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade "whey-conda" "setuptools!=61.*,<=67.1.0,>=40.6.0" "wheel>=0.34.2" + python -m pip install --upgrade "whey-conda" "hatch-requirements-txt" # $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 3ff26923..de8bd506 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -205,7 +205,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade "mkrecipe" "setuptools!=61.*,<=67.1.0,>=40.6.0" "wheel>=0.34.2" + python -m pip install --upgrade "mkrecipe" "hatch-requirements-txt" # $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/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index bb6de38a..00000000 --- a/MANIFEST.in +++ /dev/null @@ -1,7 +0,0 @@ -include __pkginfo__.py -include LICENSE -include requirements.txt -prune **/__pycache__ -include domdf_python_tools/google-10000-english-no-swears.txt -recursive-include domdf_python_tools *.pyi -include domdf_python_tools/py.typed diff --git a/pyproject.toml b/pyproject.toml index a77e98fe..6e421762 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] -requires = [ "setuptools!=61.*,<=67.1.0,>=40.6.0", "wheel>=0.34.2",] -build-backend = "setuptools.build_meta" +requires = [ "hatch-requirements-txt",] +build-backend = "hatchling.build" [project] name = "domdf_python_tools" @@ -184,3 +184,22 @@ include = false [tool.dependency-dash."doc-source/requirements.txt"] order = 30 include = false + +[tool.hatch.build] +exclude = [ + "/*", + "!/domdf_python_tools", + "!/domdf_python_tools/**/requirements.txt", + "!/requirements.txt", + "tests", + "doc-source", +] + +[tool.hatch.build.sdist] +include = [ "domdf_python_tools", "requirements.txt",] + +[tool.hatch.build.wheel] +include = [ "domdf_python_tools",] + +[tool.hatch.metadata.hooks.requirements_txt] +files = [ "requirements.txt",] diff --git a/repo_helper.yml b/repo_helper.yml index 9ce60b66..8e7b79bd 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -14,6 +14,7 @@ min_coverage: 95 tox_testenv_extras: all pre_commit_exclude: "^domdf_python_tools/compat/importlib_resources.py$" docs_fail_on_warning: true +use_hatch: true conda_channels: - conda-forge From 694184d1d9295580e5db23de1c8f60e89829048a Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 11 Feb 2025 14:36:04 +0000 Subject: [PATCH 69/77] Remove old setup.py and setup.cfg --- setup.cfg | 53 ------------------- setup.py | 28 ---------- tests/test_paths_/test_iterchildren_match.yml | 1 - 3 files changed, 82 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 4f883f97..00000000 --- a/setup.cfg +++ /dev/null @@ -1,53 +0,0 @@ -# This file is managed by 'repo_helper'. -# You may add new sections, but any changes made to the following sections will be lost: -# * metadata -# * options -# * options.packages.find -# * mypy -# * options.entry_points - -[metadata] -name = domdf_python_tools -version = 3.9.0 -author = Dominic Davis-Foster -author_email = dominic@davis-foster.co.uk -license = MIT License -keywords = utilities -long_description = file: README.rst -long_description_content_type = text/x-rst -platforms = Windows, macOS, Linux -url = https://github.com/domdfcoding/domdf_python_tools -project_urls = - Documentation = https://domdf-python-tools.readthedocs.io/en/latest - Issue Tracker = https://github.com/domdfcoding/domdf_python_tools/issues - Source Code = https://github.com/domdfcoding/domdf_python_tools -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 :: 3.11 - Programming Language :: Python :: 3.12 - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: Implementation :: PyPy - Topic :: Software Development :: Libraries :: Python Modules - Typing :: Typed - -[options] -python_requires = >=3.6 -zip_safe = False -include_package_data = True -packages = find: - -[options.packages.find] -exclude = - doc-source - tests - tests.* diff --git a/setup.py b/setup.py deleted file mode 100644 index 5bed656d..00000000 --- a/setup.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# This file is managed by 'repo_helper'. Don't edit it directly. - -# stdlib -import pathlib -import shutil -import sys - -# 3rd party -from setuptools import setup - -sys.path.append('.') - -# this package -from __pkginfo__ import * # pylint: disable=wildcard-import - -repo_root = pathlib.Path(__file__).parent -install_requires = (repo_root / "requirements.txt").read_text(encoding="UTF-8").split('\n') - -setup( - description="Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ", - extras_require=extras_require, - install_requires=install_requires, - name="domdf-python-tools", - py_modules=[], - ) - -shutil.rmtree("domdf_python_tools.egg-info", ignore_errors=True) diff --git a/tests/test_paths_/test_iterchildren_match.yml b/tests/test_paths_/test_iterchildren_match.yml index 9fcd4b87..5b019781 100644 --- a/tests/test_paths_/test_iterchildren_match.yml +++ b/tests/test_paths_/test_iterchildren_match.yml @@ -29,7 +29,6 @@ - domdf_python_tools/utils.py - domdf_python_tools/versions.py - domdf_python_tools/words.py -- setup.py - tests/__init__.py - tests/conftest.py - tests/discover_demo_module/__init__.py From 7cf7168a08403fdcc215ea78c9dd1d6657a5220a Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:39:59 +0000 Subject: [PATCH 70/77] Updated files with 'repo_helper'. (#130) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 15d1d860..b4912f4d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -81,7 +81,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.7.0 + rev: v0.8.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/README.rst b/README.rst index f9568ac5..0c5ba4d8 100644 --- a/README.rst +++ b/README.rst @@ -108,7 +108,7 @@ domdf_python_tools :target: https://github.com/domdfcoding/domdf_python_tools/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2025 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/domdf_python_tools diff --git a/doc-source/index.rst b/doc-source/index.rst index 768a8a8d..f64a05dc 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -115,7 +115,7 @@ domdf_python_tools :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2024 + .. |maintained| maintained-shield:: 2025 :alt: Maintenance .. |pypi-downloads| pypi-shield:: From be49b1a314bfcec6e5f138cc47c1a1eee2ec1742 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 12 Feb 2025 17:24:40 +0000 Subject: [PATCH 71/77] Bump version v3.9.0 -> v3.10.0 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- domdf_python_tools/__init__.py | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 652466ae..6001e213 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.9.0 +current_version = 3.10.0 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index d044acaf..57ba7b59 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -58,7 +58,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.9.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld domdf_python_tools=3.10.0=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 0c5ba4d8..641fd161 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,7 @@ domdf_python_tools .. |language| image:: https://img.shields.io/github/languages/top/domdfcoding/domdf_python_tools :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.9.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/domdfcoding/domdf_python_tools/v3.10.0 :target: https://github.com/domdfcoding/domdf_python_tools/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index f64a05dc..12f8540e 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -108,7 +108,7 @@ domdf_python_tools :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v3.9.0 + :commits-since: v3.10.0 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/domdf_python_tools/__init__.py b/domdf_python_tools/__init__.py index e9de6e49..ee5e90b3 100644 --- a/domdf_python_tools/__init__.py +++ b/domdf_python_tools/__init__.py @@ -29,7 +29,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2014-2020 Dominic Davis-Foster" __license__: str = "MIT" -__version__: str = "3.9.0" +__version__: str = "3.10.0" __email__: str = "dominic@davis-foster.co.uk" __docs = False diff --git a/pyproject.toml b/pyproject.toml index 6e421762..335c68b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "domdf_python_tools" -version = "3.9.0" +version = "3.10.0" description = "Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ" readme = "README.rst" requires-python = ">=3.6" diff --git a/repo_helper.yml b/repo_helper.yml index 8e7b79bd..4c9b41d1 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -3,7 +3,7 @@ modname: domdf_python_tools copyright_years: "2019-2022" author: "Dominic Davis-Foster" email: "dominic@davis-foster.co.uk" -version: "3.9.0" +version: "3.10.0" username: "domdfcoding" license: 'MIT' short_desc: 'Helpful functions for Pythonβ€‚πŸβ€‚πŸ› οΈ' From 353805ee61314a3d11288ccbe3a706a1ffa66ce8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 9 Apr 2025 18:41:37 +0100 Subject: [PATCH 72/77] Drop support for Python 3.6 --- .github/workflows/python_ci.yml | 6 ++---- .github/workflows/python_ci_linux.yml | 6 ++---- .github/workflows/python_ci_macos.yml | 5 ++--- pyproject.toml | 4 ++-- repo_helper.yml | 4 +--- tox.ini | 10 +++------- 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 4505aef6..83f48547 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,21 +22,19 @@ 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,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36,build", experimental: False} - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {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", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} + - {python-version: "3.13", testenvs: "py313,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39,build", experimental: True} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index de8bd506..3158d9cb 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,21 +23,19 @@ 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,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36,build", experimental: False} - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {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", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} + - {python-version: "3.13", testenvs: "py313,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index d008b4ea..f174699f 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,20 +22,19 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36,build", experimental: False} - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {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", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13", testenvs: "py313,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/pyproject.toml b/pyproject.toml index 335c68b1..35144b6f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,13 +16,13 @@ classifiers = [ "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 :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Libraries :: Python Modules", @@ -142,7 +142,7 @@ base-classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",] +python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",] python-implementations = [ "CPython", "PyPy",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 4c9b41d1..e2f87c8e 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -20,15 +20,13 @@ conda_channels: - conda-forge python_versions: - 3.6: 3.7: 3.8: 3.9: "3.10": "3.11": "3.12": - "3.13-dev": - pypy36: + "3.13": pypy37: pypy38: pypy39: diff --git a/tox.ini b/tox.ini index 8e920f9c..f9e840ae 100644 --- a/tox.ini +++ b/tox.ini @@ -22,15 +22,13 @@ [tox] envlist = - py36 py37 py38 py39 py310 py311 py312 - py313-dev - pypy36 + py313 pypy37 pypy38 pypy39 @@ -47,15 +45,13 @@ requires = [envlists] test = - py36 py37 py38 py39 py310 py311 py312 - py313-dev - pypy36 + py313 pypy37 pypy38 pypy39 @@ -68,7 +64,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py313-dev] +[testenv:py313] download = True setenv = PYTHONDEVMODE=1 From 458df4bed76191aa386eb41c79b9c0ba5f6ed80d Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 11:21:54 +0100 Subject: [PATCH 73/77] Bump Ubuntu to 22.04 (#132) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci_linux.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 0a8c0c3e..af1b3940 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -16,7 +16,7 @@ permissions: jobs: Run: name: "Flake8" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout πŸ›ŽοΈ diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 10c6f300..bd74787b 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: ['ubuntu-20.04', 'windows-2019'] + os: ['ubuntu-22.04', 'windows-2019'] fail-fast: false steps: diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 3158d9cb..2c2f3deb 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -19,8 +19,8 @@ permissions: jobs: tests: - name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}" - runs-on: "ubuntu-20.04" + name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}" + runs-on: "ubuntu-22.04" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' @@ -85,7 +85,7 @@ jobs: Coverage: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout πŸ›ŽοΈ uses: "actions/checkout@v4" @@ -134,7 +134,7 @@ jobs: Deploy: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout πŸ›ŽοΈ uses: "actions/checkout@v4" From bb77dffd85efc9e7d876ca05c670414935f460e8 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 10:59:42 +0100 Subject: [PATCH 74/77] [repo-helper] Configuration Update (#133) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci_macos.yml | 26 +++++++++++++------------- .readthedocs.yml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index f174699f..f9922496 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-13 / Python ${{ matrix.config.python-version }}" - runs-on: "macos-13" + name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}" + runs-on: "macos-${{ matrix.config.os-ver }}" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10' @@ -28,17 +28,17 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.7", testenvs: "py37,build", experimental: False} - - {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", testenvs: "py311,build", experimental: False} - - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13", testenvs: "py313,build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} - - {python-version: "pypy-3.10", testenvs: "pypy310,build", experimental: True} + - {python-version: "3.7", os-ver: "13", testenvs: "py37,build", experimental: False} + - {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False} + - {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False} + - {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False} + - {python-version: "3.11", os-ver: "14", testenvs: "py311,build", experimental: False} + - {python-version: "3.12", os-ver: "14", testenvs: "py312,build", experimental: False} + - {python-version: "3.13", os-ver: "14", testenvs: "py313,build", experimental: False} + - {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37,build", experimental: False} + - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38,build", experimental: False} + - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39,build", experimental: True} + - {python-version: "pypy-3.10", os-ver: "14", testenvs: "pypy310,build", experimental: True} steps: - name: Checkout πŸ›ŽοΈ diff --git a/.readthedocs.yml b/.readthedocs.yml index 35b5c858..e73aa4ab 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -13,7 +13,7 @@ python: - requirements: requirements.txt - requirements: doc-source/requirements.txt build: - os: ubuntu-20.04 + os: ubuntu-22.04 tools: python: '3.9' jobs: From 6a2e03a222eddd0be374deb9103131dbb3640475 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 6 May 2025 10:59:27 +0100 Subject: [PATCH 75/77] Bump alt-linux workflow to Ubuntu 22.04 --- .github/workflows/python_ci_alt_linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_ci_alt_linux.yml b/.github/workflows/python_ci_alt_linux.yml index 6aa867fd..8401ea3d 100644 --- a/.github/workflows/python_ci_alt_linux.yml +++ b/.github/workflows/python_ci_alt_linux.yml @@ -20,7 +20,7 @@ permissions: jobs: tests: name: "alt-linux / Python ${{ matrix.config.python-version }}" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" container: image: ghcr.io/domdfcoding/alt-linux-python:latest continue-on-error: ${{ matrix.config.experimental }} From de027bbf180c33fd42f743dadd2030222f27bd10 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 21:45:12 +0100 Subject: [PATCH 76/77] Updated files with 'repo_helper'. (#134) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 1 + .github/workflows/python_ci_linux.yml | 3 +++ .github/workflows/python_ci_macos.yml | 1 + .pre-commit-config.yaml | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 83f48547..f6491d97 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -79,3 +79,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 2c2f3deb..fb7d97ac 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -81,6 +81,7 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true Coverage: @@ -123,6 +124,7 @@ jobs: with: name: "combined-coverage" path: .coverage + include-hidden-files: true - name: "Upload Combined Coverage to Coveralls" if: ${{ steps.show.outcome != 'failure' }} @@ -208,6 +210,7 @@ jobs: $CONDA/bin/conda config --set always_yes yes --set changeps1 no $CONDA/bin/conda update -n base conda $CONDA/bin/conda info -a + $CONDA/bin/conda install conda-forge::py-lief=0.14.1 $CONDA/bin/conda config --add channels conda-forge $CONDA/bin/conda config --add channels domdfcoding diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index f9922496..d672cecf 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -79,3 +79,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4912f4d..bc4c3b7d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.1 + rev: v0.13.0 hooks: - id: reformat-pyproject From fa89aff45e9604c9b58b37abb91db796ed1966e7 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 16:45:44 +0100 Subject: [PATCH 77/77] Update contributing guide (#135) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- CONTRIBUTING.rst | 4 ++-- doc-source/contributing.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4c3b5a2c..35c62f8f 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -38,11 +38,11 @@ Automated tests ------------------- Tests are run with ``tox`` and ``pytest``. -To run tests for a specific Python version, such as Python 3.6: +To run tests for a specific Python version, such as Python 3.10: .. code-block:: bash - $ tox -e py36 + $ tox -e py310 To run tests for all Python versions, simply run: diff --git a/doc-source/contributing.rst b/doc-source/contributing.rst index f155af05..d3e8a02b 100644 --- a/doc-source/contributing.rst +++ b/doc-source/contributing.rst @@ -37,11 +37,11 @@ Automated tests ------------------- Tests are run with ``tox`` and ``pytest``. -To run tests for a specific Python version, such as Python 3.6: +To run tests for a specific Python version, such as Python 3.10: .. prompt:: bash - tox -e py36 + tox -e py310 To run tests for all Python versions, simply run: