diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5482197e..3a513be8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,11 +42,13 @@ repos: additional_dependencies: - tomli - - repo: https://github.com/PyCQA/docformatter - rev: v1.7.5 - hooks: - - id: docformatter - args: [--in-place] + # Disabled until fixed support for Pre-commit v4.x.x + # - repo: https://github.com/PyCQA/docformatter + # rev: v1.7.5 + # hooks: + # - id: docformatter + # args: [--in-place] + # language: python - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 1e96cb1a..0388c8e3 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -32,7 +32,7 @@ meeting or private correspondence. The Code of Conduct is heavily based on the `Ubuntu Code of Conduct`_, and the `Pylons Code of Conduct`_. -.. _`Ubuntu Code of Conduct`: https://www.ubuntu.com/community/conduct +.. _`Ubuntu Code of Conduct`: https://ubuntu.com/community/ethos/code-of-conduct .. _`Pylons Code of Conduct`: https://pylonsproject.org/community-code-of-conduct.html Be considerate diff --git a/LICENSE b/LICENSE index 2f8591a9..e03deb04 100644 --- a/LICENSE +++ b/LICENSE @@ -5,7 +5,7 @@ the new BSD license). The license is an OSI approved Open Source license and is GPL-compatible(1). The license text can also be found here: -https://www.opensource.org/licenses/BSD-3-Clause +https://www.opensource.org/license/BSD-3-Clause License diff --git a/README.rst b/README.rst index 72a19aaa..7dd95433 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ please refer to the `official documentation`_. The pytest-celery plugin is Open Source and licensed under the `BSD License`_. -.. _`BSD License`: http://www.opensource.org/licenses/BSD-3-Clause +.. _`BSD License`: https://www.opensource.org/license/BSD-3-Clause Donations ========= diff --git a/docs/conf.py b/docs/conf.py index 43074efc..e9cc9f6e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,44 +1,47 @@ from sphinx_celery import conf -globals().update( - conf.build_config( - "pytest_celery", - __file__, - project="pytest_celery", - version_dev="1.1", - version_stable="1.0", - canonical_url="https://pytest-celery.readthedocs.io/", - webdomain="pytest-celery.readthedocs.io", - github_project="celery/pytest-celery", - author="Tomer Nosrati", - author_name="Tomer Nosrati", - copyright="2024", - publisher="Celery Project", - html_logo="images/celery_512.png", - html_favicon="images/favicon.ico", - html_prepend_sidebars=["sidebardonations.html"], - extra_extensions=[ - "sphinx_click", - "sphinx.ext.napoleon", - "celery.contrib.sphinx", - "sphinxcontrib.mermaid", - ], - apicheck_ignore_modules=[ - r"celery.contrib.*", - ], - linkcheck_ignore=[ - r"^http://localhost", - r"^http://0.0.0.0", - r"https://github\.com/Jc2k/pytest-docker-tools\?tab=readme-ov-file#images", - r"https://github\.com/Jc2k/pytest-docker-tools\?tab=readme-ov-file#containers", - r"https://github\.com/Jc2k/pytest-docker-tools\?tab=readme-ov-file#fixture-wrappers", - r"https://github\.com/celery/celery/blob/main/requirements/test\.txt#L2", - r"https://github\.com/celery/celery/blob/main/tox\.ini#L30", - ], - autodoc_mock_imports=[], - ) +config = conf.build_config( + "pytest_celery", + __file__, + project="pytest_celery", + version_dev="1.1", + version_stable="1.0", + canonical_url="https://pytest-celery.readthedocs.io/", + webdomain="pytest-celery.readthedocs.io", + github_project="celery/pytest-celery", + author="Tomer Nosrati", + author_name="Tomer Nosrati", + copyright="2024", + publisher="Celery Project", + html_logo="images/celery_512.png", + html_favicon="images/favicon.ico", + html_prepend_sidebars=["sidebardonations.html"], + extra_extensions=[ + "sphinx_click", + "sphinx.ext.napoleon", + "celery.contrib.sphinx", + "sphinxcontrib.mermaid", + ], + apicheck_ignore_modules=[ + r"celery.contrib.*", + ], + linkcheck_ignore=[ + r"^http://localhost", + r"^http://0.0.0.0", + r"https://github\.com/Jc2k/pytest-docker-tools\?tab=readme-ov-file#images", + r"https://github\.com/Jc2k/pytest-docker-tools\?tab=readme-ov-file#containers", + r"https://github\.com/Jc2k/pytest-docker-tools\?tab=readme-ov-file#fixture-wrappers", + r"https://github\.com/celery/celery/blob/main/requirements/test\.txt#L2", + r"https://github\.com/celery/celery/blob/main/tox\.ini#L30", + r"https://www\.opensource\.org/license/BSD-3-Clause", + ], + autodoc_mock_imports=[], ) +del config["intersphinx_mapping"]["eventlet"] + +globals().update(config) + settings = {} ignored_settings = {} diff --git a/docs/copyright.rst b/docs/copyright.rst index b03dd31f..da4595a5 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -26,4 +26,4 @@ compatible license to this one. While the *pytest-celery* documentation is offered under the Creative Commons *Attribution-ShareAlike 4.0 International* license, the pytest-celery *software* is offered under the - `BSD License (3 Clause) `_. + `BSD License (3 Clause) `_. diff --git a/docs/index.rst b/docs/index.rst index be2ee107..15b6020f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,7 +20,7 @@ please refer to the `official documentation`_. The pytest-celery plugin is Open Source and licensed under the `BSD License`_. -.. _`BSD License`: http://www.opensource.org/licenses/BSD-3-Clause +.. _`BSD License`: https://www.opensource.org/license/BSD-3-Clause Donations ========= diff --git a/poetry.lock b/poetry.lock index bbf41a6e..8d1ad42d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1803,13 +1803,13 @@ virtualenv = ">=20.10.0" [[package]] name = "pre-commit" -version = "3.8.0" +version = "4.0.1" description = "A framework for managing and maintaining multi-language pre-commit hooks." optional = false python-versions = ">=3.9" files = [ - {file = "pre_commit-3.8.0-py2.py3-none-any.whl", hash = "sha256:9a90a53bf82fdd8778d58085faf8d83df56e40dfe18f45b19446e26bf1b3a63f"}, - {file = "pre_commit-3.8.0.tar.gz", hash = "sha256:8bb6494d4a20423842e198980c9ecf9f96607a07ea29549e180eef9ae80fe7af"}, + {file = "pre_commit-4.0.1-py2.py3-none-any.whl", hash = "sha256:efde913840816312445dc98787724647c65473daefe420785f885e8ed9a06878"}, + {file = "pre_commit-4.0.1.tar.gz", hash = "sha256:80905ac375958c0444c65e9cebebd948b3cdb518f335a091a670a89d652139d2"}, ] [package.dependencies] @@ -3668,4 +3668,4 @@ sqs = ["boto3", "botocore", "pycurl", "urllib3"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<4.0" -content-hash = "82c6be31f9a06923168352cdad111297ba9b8ee7221248ecae31e22c13af6617" +content-hash = "006e4faa2bf046fddde42e344fa399652034985b98f4af1d051b60615592466d" diff --git a/pyproject.toml b/pyproject.toml index 6e0a78b5..0ad0ff15 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,8 +115,8 @@ flake8 = [ ] pre-commit = [ { version = "^2.21.0", python = "<3.8.0" }, - { version = "^3.1.0", python = ">=3.8.0,<4.0" }, - { version = ">=3.6.0", python = ">=3.9.0,<4.0" }, + { version = "^3.1.0", python = ">=3.8.0,<3.9.0" }, + { version = "^4.0.0", python = ">=3.9.0,<4.0" }, ] mypy = ">=1.11.2" types-redis = ">=4.6.0.20240218"