diff --git a/README.md b/README.md index 4b17ce5..c83ebb1 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ pytest-awesome/ option - Comprehensive `README.rst` file that contains useful information about your plugin -- Continuous integration configuration for [AppVeyor] +- Continuous integration configuration for [GitHub Actions] - Optional documentation with either [Sphinx] or [MkDocs] - Choose from several licenses, such as [MIT], [BSD-3], [Apache v2.0], [GNU GPL v3.0+], or [MPL v2.0] @@ -126,16 +126,16 @@ Plugin is free and open source software. [tox]: https://tox.readthedocs.io/en/latest/ [Submit a Plugin]: https://docs.pytest.org/en/latest/contributing.html#submitting-plugins-to-pytest-dev [pytest hook reference]: https://docs.pytest.org/en/latest/writing_plugins.html#pytest-hook-reference - [MIT license]: http://opensource.org/licenses/MIT + [MIT license]: https://opensource.org/licenses/MIT [file an issue]: https://github.com/pytest-dev/cookiecutter-pytest-plugin/issues - [Sphinx]: http://sphinx-doc.org/ - [MkDocs]: http://www.mkdocs.org/ - [MIT]: http://opensource.org/licenses/MIT + [Sphinx]: https://sphinx-doc.org/ + [MkDocs]: https://www.mkdocs.org/ + [MIT]: https://opensource.org/licenses/MIT [MPL v2.0]: https://www.mozilla.org/media/MPL/2.0/index.txt - [BSD-3]: http://opensource.org/licenses/BSD-3-Clause - [GNU GPL v3.0+]: http://www.gnu.org/licenses/gpl-3.0.txt - [Apache v2.0]: http://www.apache.org/licenses/LICENSE-2.0 - [AppVeyor]: http://www.appveyor.com/ + [BSD-3]: https://opensource.org/licenses/BSD-3-Clause + [GNU GPL v3.0+]: https://www.gnu.org/licenses/gpl-3.0.txt + [Apache v2.0]: https://www.apache.org/licenses/LICENSE-2.0 + [GitHub Actions]: https://docs.github.com/en/actions [PyPA Code of Conduct]: https://www.pypa.io/en/latest/code-of-conduct/ [Shortbread]: https://github.com/audreyr/cookiecutter/releases/tag/1.4.0 [osi_certified]: https://opensource.org/trademarks/osi-certified/web/osi-certified-120x100.png diff --git a/docs/contributor-guide/documentation.md b/docs/contributor-guide/documentation.md index 97efd57..1903e06 100644 --- a/docs/contributor-guide/documentation.md +++ b/docs/contributor-guide/documentation.md @@ -18,4 +18,4 @@ The plugin source code can always use more documentation. Please add doc strings and regular Python comments to the actual plugin code. - [jinja2 comments]: http://jinja.pocoo.org/docs/dev/templates/#comments + [jinja2 comments]: https://jinja.palletsprojects.com/en/3.0.x/templates/#comments diff --git a/docs/index.md b/docs/index.md index 29ecf95..7571586 100644 --- a/docs/index.md +++ b/docs/index.md @@ -46,7 +46,7 @@ Plugin is free and open source software [gitter]: https://gitter.im/pytest-dev/cookiecutter-pytest-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge (Join Chat on Gitter.im) [docs_badge]: https://readthedocs.org/projects/cookiecutter-pytest-plugin/badge/?version=latest [documentation]: https://readthedocs.org/projects/cookiecutter-pytest-plugin/?badge=latest (Documentation Status) -[MIT license]: http://opensource.org/licenses/MIT +[MIT license]: https://opensource.org/licenses/MIT [file an issue]: https://github.com/pytest-dev/cookiecutter-pytest-plugin/issues diff --git a/pytest-{{cookiecutter.plugin_name}}/.github/workflows/main.yml b/pytest-{{cookiecutter.plugin_name}}/.github/workflows/main.yml new file mode 100644 index 0000000..3536192 --- /dev/null +++ b/pytest-{{cookiecutter.plugin_name}}/.github/workflows/main.yml @@ -0,0 +1,29 @@ +name: main + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8'] + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-python@v5 + with: + python-version: {% raw -%}${{ matrix.python-version }}{% endraw %} + + - name: Install tox + run: pip install tox + + - name: Test + run: tox -e py diff --git a/pytest-{{cookiecutter.plugin_name}}/README.rst b/pytest-{{cookiecutter.plugin_name}}/README.rst index 9aef9cf..f14f320 100644 --- a/pytest-{{cookiecutter.plugin_name}}/README.rst +++ b/pytest-{{cookiecutter.plugin_name}}/README.rst @@ -10,9 +10,9 @@ :target: https://pypi.org/project/pytest-{{cookiecutter.plugin_name}} :alt: Python versions -.. image:: https://ci.appveyor.com/api/projects/status/github/{{cookiecutter.github_username}}/pytest-{{cookiecutter.plugin_name}}?branch=master - :target: https://ci.appveyor.com/project/{{cookiecutter.github_username}}/pytest-{{cookiecutter.plugin_name}}/branch/master - :alt: See Build Status on AppVeyor +.. image:: https://github.com/{{cookiecutter.github_username}}/pytest-{{cookiecutter.plugin_name}}/actions/workflows/main.yml/badge.svg + :target: https://github.com/{{cookiecutter.github_username}}/pytest-{{cookiecutter.plugin_name}}/actions/workflows/main.yml + :alt: See Build Status on GitHub Actions {{cookiecutter.short_description}} @@ -64,10 +64,10 @@ If you encounter any problems, please `file an issue`_ along with a detailed des .. _`Cookiecutter`: https://github.com/audreyr/cookiecutter .. _`@hackebrot`: https://github.com/hackebrot -.. _`MIT`: http://opensource.org/licenses/MIT -.. _`BSD-3`: http://opensource.org/licenses/BSD-3-Clause -.. _`GNU GPL v3.0`: http://www.gnu.org/licenses/gpl-3.0.txt -.. _`Apache Software License 2.0`: http://www.apache.org/licenses/LICENSE-2.0 +.. _`MIT`: https://opensource.org/licenses/MIT +.. _`BSD-3`: https://opensource.org/licenses/BSD-3-Clause +.. _`GNU GPL v3.0`: https://www.gnu.org/licenses/gpl-3.0.txt +.. _`Apache Software License 2.0`: https://www.apache.org/licenses/LICENSE-2.0 .. _`cookiecutter-pytest-plugin`: https://github.com/pytest-dev/cookiecutter-pytest-plugin .. _`file an issue`: https://github.com/{{cookiecutter.github_username}}/pytest-{{cookiecutter.plugin_name}}/issues .. _`pytest`: https://github.com/pytest-dev/pytest diff --git a/pytest-{{cookiecutter.plugin_name}}/appveyor.yml b/pytest-{{cookiecutter.plugin_name}}/appveyor.yml deleted file mode 100644 index f22b384..0000000 --- a/pytest-{{cookiecutter.plugin_name}}/appveyor.yml +++ /dev/null @@ -1,20 +0,0 @@ -# https://www.appveyor.com/docs/lang/python/ ---- -image: - - Visual Studio 2019 - -environment: - matrix: - - TOXENV: "py38" - - TOXENV: "py39" - - TOXENV: "py310" - - TOXENV: "py311" - - TOXENV: "py312" - -build: false - -install: - - py -m pip install tox - -test_script: - - py -m tox diff --git a/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/Makefile b/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/Makefile index 2d87ff4..2a7a071 100644 --- a/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/Makefile +++ b/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/Makefile @@ -9,7 +9,7 @@ BUILDDIR = _build # User-friendly check for sphinx-build ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) +$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://sphinx-doc.org/) endif # Internal variables. diff --git a/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/make.bat b/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/make.bat index 28beda1..6ff01b2 100644 --- a/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/make.bat +++ b/pytest-{{cookiecutter.plugin_name}}/docs_sources/sphinx/make.bat @@ -65,7 +65,7 @@ if errorlevel 9009 ( echo.may add the Sphinx directory to PATH. echo. echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ + echo.https://sphinx-doc.org/ exit /b 1 ) diff --git a/pytest-{{cookiecutter.plugin_name}}/licenses/Apache-2 b/pytest-{{cookiecutter.plugin_name}}/licenses/Apache-2 index 70e2d7f..9dea6b2 100644 --- a/pytest-{{cookiecutter.plugin_name}}/licenses/Apache-2 +++ b/pytest-{{cookiecutter.plugin_name}}/licenses/Apache-2 @@ -1,4 +1,4 @@ -{#- source: http://www.apache.org/licenses/LICENSE-2.0 #} +{#- source: https://www.apache.org/licenses/LICENSE-2.0 #} Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/pytest-{{cookiecutter.plugin_name}}/licenses/BSD-3 b/pytest-{{cookiecutter.plugin_name}}/licenses/BSD-3 index a1b1549..59024da 100644 --- a/pytest-{{cookiecutter.plugin_name}}/licenses/BSD-3 +++ b/pytest-{{cookiecutter.plugin_name}}/licenses/BSD-3 @@ -1,4 +1,4 @@ -{#- source: http://opensource.org/licenses/BSD-3-Clause #} +{#- source: https://opensource.org/licenses/BSD-3-Clause #} Copyright (c) {% now 'utc', '%Y' %}, {{cookiecutter.full_name}} All rights reserved. diff --git a/pytest-{{cookiecutter.plugin_name}}/licenses/GPL-3 b/pytest-{{cookiecutter.plugin_name}}/licenses/GPL-3 index 9b0191d..cc38754 100644 --- a/pytest-{{cookiecutter.plugin_name}}/licenses/GPL-3 +++ b/pytest-{{cookiecutter.plugin_name}}/licenses/GPL-3 @@ -1,8 +1,8 @@ -{# source: http://www.gnu.org/licenses/gpl-3.0.txt #} +{# source: https://www.gnu.org/licenses/gpl-3.0.txt #} GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -646,7 +646,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -665,11 +665,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/pytest-{{cookiecutter.plugin_name}}/licenses/MIT b/pytest-{{cookiecutter.plugin_name}}/licenses/MIT index c093d51..6b5d377 100644 --- a/pytest-{{cookiecutter.plugin_name}}/licenses/MIT +++ b/pytest-{{cookiecutter.plugin_name}}/licenses/MIT @@ -1,4 +1,4 @@ -{#- source: http://opensource.org/licenses/MIT #} +{#- source: https://opensource.org/licenses/MIT #} The MIT License (MIT) Copyright (c) {% now 'utc', '%Y' %} {{cookiecutter.full_name}} diff --git a/pytest-{{cookiecutter.plugin_name}}/licenses/MPL-2 b/pytest-{{cookiecutter.plugin_name}}/licenses/MPL-2 index d6d1967..896a94f 100644 --- a/pytest-{{cookiecutter.plugin_name}}/licenses/MPL-2 +++ b/pytest-{{cookiecutter.plugin_name}}/licenses/MPL-2 @@ -358,7 +358,7 @@ Exhibit A - Source Code Form License Notice This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. + file, You can obtain one at https://mozilla.org/MPL/2.0/. If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE