Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-rst.linker for
openSUSE:Factory checked in at 2022-08-30 14:49:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-rst.linker (Old)
and /work/SRC/openSUSE:Factory/.python-rst.linker.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rst.linker"
Tue Aug 30 14:49:58 2022 rev:8 rq:1000116 version:2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-rst.linker/python-rst.linker.changes
2020-10-29 09:46:06.396043954 +0100
+++
/work/SRC/openSUSE:Factory/.python-rst.linker.new.2083/python-rst.linker.changes
2022-08-30 14:50:45.988317379 +0200
@@ -1,0 +2,18 @@
+Mon Aug 29 13:59:54 UTC 2022 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 2.3.1
+ * Packaging refresh.
+ + #12: Added locale stability for tests.
+- v2.3.0:
+ * #9: Fixed syntax errors in docs.
+ * Require Python 3.7 or later.
+- v2.2.0
+ * #8: Prefer author date to committer date when adding SCM
+ timestamps, reverting change in 2.1, and this time tracking the
+ motivation more carefully.
+- v2.1.1: Fix Github Actions badge.
+- v2.1.0 Prefer committer date to author date when adding SCM
+ timestamps.
+- Don't build the docs
+
+-------------------------------------------------------------------
Old:
----
rst.linker-2.0.0.tar.gz
New:
----
rst.linker-2.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-rst.linker.spec ++++++
--- /var/tmp/diff_new_pack.52O0cX/_old 2022-08-30 14:50:46.480318634 +0200
+++ /var/tmp/diff_new_pack.52O0cX/_new 2022-08-30 14:50:46.508318706 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-rst.linker
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,29 +17,29 @@
%define _name rst.linker
-%define skip_python2 1
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-rst.linker
-Version: 2.0.0
+Version: 2.3.1
Release: 0
Summary: Changelog link and timestamp adding Sphinx plugin
License: MIT
URL: https://github.com/jaraco/rst.linker
Source:
https://files.pythonhosted.org/packages/source/r/%{_name}/%{_name}-%{version}.tar.gz
-BuildRequires: %{python_module importlib-metadata}
-BuildRequires: %{python_module jaraco.packaging >= 3.2}
+BuildRequires: %{python_module base >= 3.7}
+BuildRequires: %{python_module importlib-metadata if %python-version < 3.8}
BuildRequires: %{python_module path}
-BuildRequires: %{python_module pytest >= 3.5}
+BuildRequires: %{python_module pip}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module python-dateutil}
-BuildRequires: %{python_module setuptools_scm}
-BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module six}
+BuildRequires: %{python_module setuptools >= 56}
+BuildRequires: %{python_module setuptools_scm >= 3.4.1}
+BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-Sphinx
+%if 0%{python_version_nodots} < 38
Requires: python-importlib-metadata
+%endif
Requires: python-python-dateutil
-Requires: python-six
BuildArch: noarch
%python_subpackages
@@ -49,23 +49,22 @@
%prep
%setup -q -n %{_name}-%{version}
-sed -i -e 's/--flake8//' -e 's/--black//' -e 's/--cov//' pytest.ini
%build
-%python_build
-python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
+%pyproject_wheel
%install
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-%pytest test_all.py
+%pytest
%files %{python_files}
%license LICENSE
%doc CHANGES.rst README.rst
-%doc build/sphinx/html
-%{python_sitelib}/*
+# This needs a fix if there will be any more rst.* namespace packages (none on
PyPI so far)
+%{python_sitelib}/rst
+%{python_sitelib}/rst.linker-%{version}*-info
%changelog
++++++ rst.linker-2.0.0.tar.gz -> rst.linker-2.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.coveragerc
new/rst.linker-2.3.1/.coveragerc
--- old/rst.linker-2.0.0/.coveragerc 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/.coveragerc 2022-08-26 03:10:04.000000000 +0200
@@ -1,5 +1,8 @@
[run]
-omit = .tox/*
+omit =
+ # leading `*/` for pytest-dev/pytest-cov#456
+ */.tox/*
+ */pep517-build-env-*
[report]
show_missing = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.editorconfig
new/rst.linker-2.3.1/.editorconfig
--- old/rst.linker-2.0.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100
+++ new/rst.linker-2.3.1/.editorconfig 2022-08-26 03:10:04.000000000 +0200
@@ -0,0 +1,19 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+insert_final_newline = true
+end_of_line = lf
+
+[*.py]
+indent_style = space
+max_line_length = 88
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.rst]
+indent_style = space
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.flake8 new/rst.linker-2.3.1/.flake8
--- old/rst.linker-2.0.0/.flake8 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/.flake8 2022-08-26 03:10:04.000000000 +0200
@@ -1,9 +1,9 @@
[flake8]
max-line-length = 88
-ignore =
- # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
- W503
- # W504 has issues
https://github.com/OCA/maintainer-quality-tools/issues/545
- W504
+
+# jaraco/skeleton#34
+max-complexity = 10
+
+extend-ignore =
# Black creates whitespace before colon
E203
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.github/dependabot.yml
new/rst.linker-2.3.1/.github/dependabot.yml
--- old/rst.linker-2.0.0/.github/dependabot.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/rst.linker-2.3.1/.github/dependabot.yml 2022-08-26 03:10:04.000000000
+0200
@@ -0,0 +1,8 @@
+version: 2
+updates:
+ - package-ecosystem: "pip"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ allow:
+ - dependency-type: "all"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.github/workflows/main.yml
new/rst.linker-2.3.1/.github/workflows/main.yml
--- old/rst.linker-2.0.0/.github/workflows/main.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/rst.linker-2.3.1/.github/workflows/main.yml 2022-08-26
03:10:04.000000000 +0200
@@ -0,0 +1,63 @@
+name: tests
+
+on: [push, pull_request]
+
+jobs:
+ test:
+ strategy:
+ matrix:
+ python:
+ - 3.7
+ - '3.10'
+ - '3.11'
+ platform:
+ - ubuntu-latest
+ - macos-latest
+ - windows-latest
+ runs-on: ${{ matrix.platform }}
+ steps:
+ - uses: actions/checkout@v3
+ - name: Setup Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python }}-dev
+ - name: Install tox
+ run: |
+ python -m pip install tox
+ - name: Run tests
+ run: tox
+
+ check: # This job does nothing and is only used for the branch protection
+ if: always()
+
+ needs:
+ - test
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Decide whether the needed jobs succeeded or failed
+ uses: re-actors/alls-green@release/v1
+ with:
+ jobs: ${{ toJSON(needs) }}
+
+ release:
+ needs:
+ - check
+ if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Setup Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: "3.11-dev"
+ - name: Install tox
+ run: |
+ python -m pip install tox
+ - name: Release
+ run: tox -e release
+ env:
+ TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.pre-commit-config.yaml
new/rst.linker-2.3.1/.pre-commit-config.yaml
--- old/rst.linker-2.0.0/.pre-commit-config.yaml 2019-11-28
17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/.pre-commit-config.yaml 2022-08-26
03:10:04.000000000 +0200
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/psf/black
- rev: 19.3b0
+ rev: 22.6.0
hooks:
- id: black
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.readthedocs.yml
new/rst.linker-2.3.1/.readthedocs.yml
--- old/rst.linker-2.0.0/.readthedocs.yml 2019-11-28 17:36:37.000000000
+0100
+++ new/rst.linker-2.3.1/.readthedocs.yml 2022-08-26 03:10:04.000000000
+0200
@@ -1,5 +1,6 @@
+version: 2
python:
- version: 3
- extra_requirements:
- - docs
- pip_install: true
+ install:
+ - path: .
+ extra_requirements:
+ - docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/.travis.yml
new/rst.linker-2.3.1/.travis.yml
--- old/rst.linker-2.0.0/.travis.yml 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-dist: xenial
-language: python
-
-python:
-- 3.6
-- &latest_py3 3.8
-
-git:
- depth: 99999
-
-jobs:
- fast_finish: true
- include:
- - stage: deploy
- if: tag IS present
- python: *latest_py3
- before_script: skip
- script: tox -e release
-
-cache: pip
-
-install:
-- pip install tox tox-venv
-
-before_script:
- # Disable IPv6. Ref travis-ci/travis-ci#8361
- - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
- sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
- fi
-script: tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/CHANGES.rst
new/rst.linker-2.3.1/CHANGES.rst
--- old/rst.linker-2.0.0/CHANGES.rst 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/CHANGES.rst 2022-08-26 03:10:04.000000000 +0200
@@ -1,3 +1,35 @@
+v2.3.1
+======
+
+Packaging refresh.
+
+#12: Added locale stability for tests.
+
+v2.3.0
+======
+
+#9: Fixed syntax errors in docs.
+
+Require Python 3.7 or later.
+
+v2.2.0
+======
+
+#8: Prefer author date to committer date when adding SCM
+timestamps, reverting change in 2.1, and this time tracking
+the motivation more carefully.
+
+v2.1.1
+======
+
+Fix Github Actions badge.
+
+v2.1.0
+======
+
+Prefer committer date to author date when adding SCM
+timestamps.
+
v2.0.0
======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/LICENSE new/rst.linker-2.3.1/LICENSE
--- old/rst.linker-2.0.0/LICENSE 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/LICENSE 2022-08-26 03:10:04.000000000 +0200
@@ -1,7 +1,19 @@
Copyright Jason R. Coombs
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/PKG-INFO
new/rst.linker-2.3.1/PKG-INFO
--- old/rst.linker-2.0.0/PKG-INFO 2019-11-28 17:37:04.607312700 +0100
+++ new/rst.linker-2.3.1/PKG-INFO 2022-08-26 03:10:38.143206100 +0200
@@ -1,50 +1,54 @@
Metadata-Version: 2.1
Name: rst.linker
-Version: 2.0.0
+Version: 2.3.1
Summary: Tools for adding metadata and hyperlinks to reStructuredText
Home-page: https://github.com/jaraco/rst.linker
Author: Jason R. Coombs
Author-email: jar...@jaraco.com
-License: UNKNOWN
-Description: .. image:: https://img.shields.io/pypi/v/rst.linker.svg
- :target: https://pypi.org/project/rst.linker
-
- .. image:: https://img.shields.io/pypi/pyversions/rst.linker.svg
-
- .. image:: https://img.shields.io/travis/jaraco/rst.linker/master.svg
- :target: https://travis-ci.org/jaraco/rst.linker
-
- .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
- :target: https://github.com/psf/black
- :alt: Code style: Black
-
- .. .. image::
https://img.shields.io/appveyor/ci/jaraco/rst-linker/master.svg
- .. :target:
https://ci.appveyor.com/project/jaraco/rst-linker/branch/master
-
- .. image::
https://readthedocs.org/projects/rstlinker/badge/?version=latest
- :target: https://rstlinker.readthedocs.io/en/latest/?badge=latest
-
-
- ``rst.linker`` provides a routine for adding links and performing
- other custom replacements to reStructuredText files as a Sphinx
- extension.
-
- Usage
- =====
-
- In your sphinx ``conf`` file, include ``rst.linker`` as an extension
- and then add a ``link_files`` configuration section describing
- the substitutions to make. For an example, see `rst.linker's own
- conf.py
- <https://github.com/jaraco/rst.linker/blob/master/docs/conf.py>`_
- or read the source to learn more about the the linkers provided.
-
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Framework :: Sphinx :: Extension
-Requires-Python: >=3.6
+Requires-Python: >=3.7
Provides-Extra: testing
Provides-Extra: docs
+License-File: LICENSE
+
+.. image:: https://img.shields.io/pypi/v/rst.linker.svg
+ :target: `PyPI link`_
+
+.. image:: https://img.shields.io/pypi/pyversions/rst.linker.svg
+ :target: `PyPI link`_
+
+.. _PyPI link: https://pypi.org/project/rst.linker
+
+.. image:: https://github.com/jaraco/rst.linker/workflows/tests/badge.svg
+ :target:
https://github.com/jaraco/rst.linker/actions?query=workflow%3A%22tests%22
+ :alt: tests
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/psf/black
+ :alt: Code style: Black
+
+.. image:: https://readthedocs.org/projects/rstlinker/badge/?version=latest
+ :target: https://rstlinker.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://img.shields.io/badge/skeleton-2022-informational
+ :target: https://blog.jaraco.com/skeleton
+
+
+``rst.linker`` provides a routine for adding links and performing
+other custom replacements to reStructuredText files as a Sphinx
+extension.
+
+Usage
+=====
+
+In your sphinx ``conf`` file, include ``rst.linker`` as an extension
+and then add a ``link_files`` configuration section describing
+the substitutions to make. For an example, see `rst.linker's own
+conf.py
+<https://github.com/jaraco/rst.linker/blob/master/docs/conf.py>`_
+or read the source to learn more about the the linkers provided.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/README.rst
new/rst.linker-2.3.1/README.rst
--- old/rst.linker-2.0.0/README.rst 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/README.rst 2022-08-26 03:10:04.000000000 +0200
@@ -1,21 +1,25 @@
.. image:: https://img.shields.io/pypi/v/rst.linker.svg
- :target: https://pypi.org/project/rst.linker
+ :target: `PyPI link`_
.. image:: https://img.shields.io/pypi/pyversions/rst.linker.svg
+ :target: `PyPI link`_
-.. image:: https://img.shields.io/travis/jaraco/rst.linker/master.svg
- :target: https://travis-ci.org/jaraco/rst.linker
+.. _PyPI link: https://pypi.org/project/rst.linker
+
+.. image:: https://github.com/jaraco/rst.linker/workflows/tests/badge.svg
+ :target:
https://github.com/jaraco/rst.linker/actions?query=workflow%3A%22tests%22
+ :alt: tests
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/psf/black
:alt: Code style: Black
-.. .. image:: https://img.shields.io/appveyor/ci/jaraco/rst-linker/master.svg
-.. :target: https://ci.appveyor.com/project/jaraco/rst-linker/branch/master
-
.. image:: https://readthedocs.org/projects/rstlinker/badge/?version=latest
:target: https://rstlinker.readthedocs.io/en/latest/?badge=latest
+.. image:: https://img.shields.io/badge/skeleton-2022-informational
+ :target: https://blog.jaraco.com/skeleton
+
``rst.linker`` provides a routine for adding links and performing
other custom replacements to reStructuredText files as a Sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/appveyor.yml
new/rst.linker-2.3.1/appveyor.yml
--- old/rst.linker-2.0.0/appveyor.yml 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/appveyor.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-environment:
-
- APPVEYOR: true
-
- matrix:
- - PYTHON: "C:\\Python36-x64"
- - PYTHON: "C:\\Python37-x64"
-
-install:
- # symlink python from a directory with a space
- - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
- - "SET PYTHON=\"C:\\Program Files\\Python\""
- - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-
-build: off
-
-cache:
- - '%LOCALAPPDATA%\pip\Cache'
-
-test_script:
- - "python -m pip install -U tox tox-venv virtualenv"
- - "tox"
-
-version: '{build}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/docs/conf.py
new/rst.linker-2.3.1/docs/conf.py
--- old/rst.linker-2.0.0/docs/conf.py 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/docs/conf.py 2022-08-26 03:10:04.000000000 +0200
@@ -14,13 +14,23 @@
url='{package_url}/issues/{issue}',
),
dict(
- pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
+ pattern=r'(?m:^((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n)',
with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
),
dict(
pattern=r'PEP[- ](?P<pep_number>\d+)',
- url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+ url='https://peps.python.org/pep-{pep_number:0>4}/',
),
],
)
}
+
+# Be strict about any broken references:
+nitpicky = True
+
+# Include Python intersphinx mapping to prevent failures
+# jaraco/skeleton#51
+extensions += ['sphinx.ext.intersphinx']
+intersphinx_mapping = {
+ 'python': ('https://docs.python.org/3', None),
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/docs/index.rst
new/rst.linker-2.3.1/docs/index.rst
--- old/rst.linker-2.0.0/docs/index.rst 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/docs/index.rst 2022-08-26 03:10:04.000000000 +0200
@@ -1,5 +1,5 @@
-Welcome to rst.linker documentation!
-========================================
+Welcome to |project| documentation!
+===================================
.. toctree::
:maxdepth: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/mypy.ini
new/rst.linker-2.3.1/mypy.ini
--- old/rst.linker-2.0.0/mypy.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/rst.linker-2.3.1/mypy.ini 2022-08-26 03:10:04.000000000 +0200
@@ -0,0 +1,2 @@
+[mypy]
+ignore_missing_imports = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/pyproject.toml
new/rst.linker-2.3.1/pyproject.toml
--- old/rst.linker-2.0.0/pyproject.toml 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/pyproject.toml 2022-08-26 03:10:04.000000000 +0200
@@ -1,6 +1,20 @@
[build-system]
-requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
+requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"]
build-backend = "setuptools.build_meta"
[tool.black]
skip-string-normalization = true
+
+[tool.setuptools_scm]
+
+[tool.pytest-enabler.black]
+addopts = "--black"
+
+[tool.pytest-enabler.mypy]
+addopts = "--mypy"
+
+[tool.pytest-enabler.flake8]
+addopts = "--flake8"
+
+[tool.pytest-enabler.cov]
+addopts = "--cov"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/pytest.ini
new/rst.linker-2.3.1/pytest.ini
--- old/rst.linker-2.0.0/pytest.ini 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/pytest.ini 2022-08-26 03:10:04.000000000 +0200
@@ -1,5 +1,17 @@
[pytest]
norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules --flake8 --black --cov
+addopts=--doctest-modules
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
filterwarnings=
+ # Suppress deprecation warning in flake8
+ ignore:SelectableGroups dict interface is deprecated::flake8
+
+ # shopkeep/pytest-black#55
+ ignore:<class 'pytest_black.BlackItem'> is not using a cooperative
constructor:pytest.PytestDeprecationWarning
+ ignore:The \(fspath. py.path.local\) argument to BlackItem is
deprecated.:pytest.PytestDeprecationWarning
+ ignore:BlackItem is an Item subclass and should not be a
collector:pytest.PytestWarning
+
+ # tholo/pytest-flake8#83
+ ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative
constructor:pytest.PytestDeprecationWarning
+ ignore:The \(fspath. py.path.local\) argument to Flake8Item is
deprecated.:pytest.PytestDeprecationWarning
+ ignore:Flake8Item is an Item subclass and should not be a
collector:pytest.PytestWarning
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/rst/__init__.py
new/rst.linker-2.3.1/rst/__init__.py
--- old/rst.linker-2.0.0/rst/__init__.py 2019-11-28 17:36:37.000000000
+0100
+++ new/rst.linker-2.3.1/rst/__init__.py 2022-08-26 03:10:04.000000000
+0200
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__) # noqa
+__path__ = __import__('pkgutil').extend_path(__path__, __name__) # type:
ignore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/rst/linker.py
new/rst.linker-2.3.1/rst/linker.py
--- old/rst.linker-2.0.0/rst/linker.py 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/rst/linker.py 2022-08-26 03:10:04.000000000 +0200
@@ -10,9 +10,9 @@
import functools
try:
- import importlib.metadata as importlib_metadata
+ import importlib.metadata as importlib_metadata # type: ignore
except ImportError:
- import importlib_metadata
+ import importlib_metadata # type: ignore
import dateutil.parser
@@ -36,13 +36,13 @@
class URLLinker(Repl):
r"""
- Each replacement should have the form:
+ Each replacement should have the form::
- {
- pattern: "Issue #?(?P<number>\d+)",
- url: "{bitbucket}/jaraco/rst.linker/issues/{number}",
- bitbucket: https://bitbucket.org
- }
+ {
+ pattern: "Issue #?(?P<number>\d+)",
+ url: "{bitbucket}/jaraco/rst.linker/issues/{number}",
+ bitbucket: https://bitbucket.org
+ }
Currently, each named group must be unique across all Repl objects used
in a replacement.
@@ -65,7 +65,7 @@
Replace content with a version number to include the date stamp
from the SCM.
- For example, consider a changelog with the following:
+ For example, consider a changelog with the following::
1.0
---
@@ -73,23 +73,23 @@
Changed something.
The following replacement definition would add a datestamp
- after the heading:
+ after the heading::
- {
- pattern: r"^(?m)((?P<scm_version>\d+(\.\d+){1,2})\n-+\n)",
- with_scm: "{text}\nTagged {rev[timestamp]}\n",
- }
+ {
+ pattern: r"(?m:^((?P<scm_version>\d+(\.\d+){1,2})\n-+\n))",
+ with_scm: "{text}\nTagged {rev[timestamp]}\n",
+ }
If the scm_version is detected, a timestamp will be added to the
namespace.
If detected, the rev[timestamp] is a datetime-aware timestamp,
so arbitrary formatting operators may be applied to it, such as
- the following which will render as "Dec 2000":
+ the following which will render as "Dec 2000"::
- {
- with_scm: "{rev[timestamp]:%b %Y}",
- }
+ {
+ with_scm: "{rev[timestamp]:%b %Y}",
+ }
"""
def replace(self, match, replacer_vars):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/rst.linker.egg-info/PKG-INFO
new/rst.linker-2.3.1/rst.linker.egg-info/PKG-INFO
--- old/rst.linker-2.0.0/rst.linker.egg-info/PKG-INFO 2019-11-28
17:37:04.000000000 +0100
+++ new/rst.linker-2.3.1/rst.linker.egg-info/PKG-INFO 2022-08-26
03:10:38.000000000 +0200
@@ -1,50 +1,54 @@
Metadata-Version: 2.1
Name: rst.linker
-Version: 2.0.0
+Version: 2.3.1
Summary: Tools for adding metadata and hyperlinks to reStructuredText
Home-page: https://github.com/jaraco/rst.linker
Author: Jason R. Coombs
Author-email: jar...@jaraco.com
-License: UNKNOWN
-Description: .. image:: https://img.shields.io/pypi/v/rst.linker.svg
- :target: https://pypi.org/project/rst.linker
-
- .. image:: https://img.shields.io/pypi/pyversions/rst.linker.svg
-
- .. image:: https://img.shields.io/travis/jaraco/rst.linker/master.svg
- :target: https://travis-ci.org/jaraco/rst.linker
-
- .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
- :target: https://github.com/psf/black
- :alt: Code style: Black
-
- .. .. image::
https://img.shields.io/appveyor/ci/jaraco/rst-linker/master.svg
- .. :target:
https://ci.appveyor.com/project/jaraco/rst-linker/branch/master
-
- .. image::
https://readthedocs.org/projects/rstlinker/badge/?version=latest
- :target: https://rstlinker.readthedocs.io/en/latest/?badge=latest
-
-
- ``rst.linker`` provides a routine for adding links and performing
- other custom replacements to reStructuredText files as a Sphinx
- extension.
-
- Usage
- =====
-
- In your sphinx ``conf`` file, include ``rst.linker`` as an extension
- and then add a ``link_files`` configuration section describing
- the substitutions to make. For an example, see `rst.linker's own
- conf.py
- <https://github.com/jaraco/rst.linker/blob/master/docs/conf.py>`_
- or read the source to learn more about the the linkers provided.
-
-Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Framework :: Sphinx :: Extension
-Requires-Python: >=3.6
+Requires-Python: >=3.7
Provides-Extra: testing
Provides-Extra: docs
+License-File: LICENSE
+
+.. image:: https://img.shields.io/pypi/v/rst.linker.svg
+ :target: `PyPI link`_
+
+.. image:: https://img.shields.io/pypi/pyversions/rst.linker.svg
+ :target: `PyPI link`_
+
+.. _PyPI link: https://pypi.org/project/rst.linker
+
+.. image:: https://github.com/jaraco/rst.linker/workflows/tests/badge.svg
+ :target:
https://github.com/jaraco/rst.linker/actions?query=workflow%3A%22tests%22
+ :alt: tests
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/psf/black
+ :alt: Code style: Black
+
+.. image:: https://readthedocs.org/projects/rstlinker/badge/?version=latest
+ :target: https://rstlinker.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://img.shields.io/badge/skeleton-2022-informational
+ :target: https://blog.jaraco.com/skeleton
+
+
+``rst.linker`` provides a routine for adding links and performing
+other custom replacements to reStructuredText files as a Sphinx
+extension.
+
+Usage
+=====
+
+In your sphinx ``conf`` file, include ``rst.linker`` as an extension
+and then add a ``link_files`` configuration section describing
+the substitutions to make. For an example, see `rst.linker's own
+conf.py
+<https://github.com/jaraco/rst.linker/blob/master/docs/conf.py>`_
+or read the source to learn more about the the linkers provided.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/rst.linker.egg-info/SOURCES.txt
new/rst.linker-2.3.1/rst.linker.egg-info/SOURCES.txt
--- old/rst.linker-2.0.0/rst.linker.egg-info/SOURCES.txt 2019-11-28
17:37:04.000000000 +0100
+++ new/rst.linker-2.3.1/rst.linker.egg-info/SOURCES.txt 2022-08-26
03:10:38.000000000 +0200
@@ -1,19 +1,19 @@
.coveragerc
+.editorconfig
.flake8
.pre-commit-config.yaml
.readthedocs.yml
-.travis.yml
CHANGES.rst
LICENSE
README.rst
-appveyor.yml
+mypy.ini
pyproject.toml
pytest.ini
setup.cfg
-setup.py
-skeleton.md
test_all.py
tox.ini
+.github/dependabot.yml
+.github/workflows/main.yml
docs/conf.py
docs/history.rst
docs/index.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/rst.linker.egg-info/requires.txt
new/rst.linker-2.3.1/rst.linker.egg-info/requires.txt
--- old/rst.linker-2.0.0/rst.linker.egg-info/requires.txt 2019-11-28
17:37:04.000000000 +0100
+++ new/rst.linker-2.3.1/rst.linker.egg-info/requires.txt 2022-08-26
03:10:38.000000000 +0200
@@ -5,13 +5,19 @@
[docs]
sphinx
-jaraco.packaging>=3.2
+jaraco.packaging>=9
rst.linker>=1.9
[testing]
-pytest!=3.7.3,>=3.5
-pytest-checkdocs>=1.2.3
+pytest>=6
+pytest-checkdocs>=2.4
pytest-flake8
-pytest-black-multipy
+flake8<5
pytest-cov
-path.py
+pytest-enabler>=1.3
+path
+types-python-dateutil
+
+[testing:platform_python_implementation != "PyPy"]
+pytest-black>=0.3.7
+pytest-mypy>=0.9.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/setup.cfg
new/rst.linker-2.3.1/setup.cfg
--- old/rst.linker-2.0.0/setup.cfg 2019-11-28 17:37:04.611312600 +0100
+++ new/rst.linker-2.3.1/setup.cfg 2022-08-26 03:10:38.143206100 +0200
@@ -1,8 +1,4 @@
-[bdist_wheel]
-universal = 1
-
[metadata]
-license_file = LICENSE
name = rst.linker
author = Jason R. Coombs
author_email = jar...@jaraco.com
@@ -14,29 +10,42 @@
Intended Audience :: Developers
License :: OSI Approved :: MIT License
Programming Language :: Python :: 3
+ Programming Language :: Python :: 3 :: Only
Framework :: Sphinx :: Extension
[options]
-packages = find:
+packages = find_namespace:
include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.7
install_requires =
python-dateutil
importlib_metadata; python_version < "3.8"
-setup_requires = setuptools_scm >= 1.15.0
+
+[options.packages.find]
+exclude =
+ build*
+ dist*
+ docs*
+ tests*
[options.extras_require]
testing =
- pytest >= 3.5, !=3.7.3
- pytest-checkdocs >= 1.2.3
+ pytest >= 6
+ pytest-checkdocs >= 2.4
pytest-flake8
- pytest-black-multipy
+ flake8 < 5
+ pytest-black >= 0.3.7; \
+ python_implementation != "PyPy"
pytest-cov
+ pytest-mypy >= 0.9.1; \
+ python_implementation != "PyPy"
+ pytest-enabler >= 1.3
- path.py
+ path
+ types-python-dateutil
docs =
sphinx
- jaraco.packaging >= 3.2
+ jaraco.packaging >= 9
rst.linker >= 1.9
[options.entry_points]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/setup.py
new/rst.linker-2.3.1/setup.py
--- old/rst.linker-2.0.0/setup.py 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/setup.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import setuptools
-
-if __name__ == "__main__":
- setuptools.setup(use_scm_version=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/skeleton.md
new/rst.linker-2.3.1/skeleton.md
--- old/rst.linker-2.0.0/skeleton.md 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/skeleton.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,137 +0,0 @@
-# Overview
-
-This project is merged with [skeleton](https://github.com/jaraco/skeleton).
What is skeleton? It's the scaffolding of a Python project jaraco [introduced
in his blog](https://blog.jaraco.com/a-project-skeleton-for-python-projects/).
It seeks to provide a means to re-use techniques and inherit advances when
managing projects for distribution.
-
-## An SCM Managed Approach
-
-While maintaining dozens of projects in PyPI, jaraco derives best practices
for project distribution and publishes them in the [skeleton
repo](https://github.com/jaraco/skeleton), a git repo capturing the evolution
and culmination of these best practices.
-
-It's intended to be used by a new or existing project to adopt these practices
and honed and proven techniques. Adopters are encouraged to use the project
directly and maintain a small deviation from the technique, make their own fork
for more substantial changes unique to their environment or preferences, or
simply adopt the skeleton once and abandon it thereafter.
-
-The primary advantage to using an SCM for maintaining these techniques is that
those tools help facilitate the merge between the template and its adopting
projects.
-
-Another advantage to using an SCM-managed approach is that tools like GitHub
recognize that a change in the skeleton is the _same change_ across all
projects that merge with that skeleton. Without the ancestry, with a
traditional copy/paste approach, a [commit like
this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8cd8d3a5beab2d5)
would produce notifications in the upstream project issue for each and every
application, but because it's centralized, GitHub provides just the one
notification when the change is added to the skeleton.
-
-# Usage
-
-## new projects
-
-To use skeleton for a new project, simply pull the skeleton into a new project:
-
-```
-$ git init my-new-project
-$ cd my-new-project
-$ git pull gh://jaraco/skeleton
-```
-
-Now customize the project to suit your individual project needs.
-
-## existing projects
-
-If you have an existing project, you can still incorporate the skeleton by
merging it into the codebase.
-
-```
-$ git merge skeleton --allow-unrelated-histories
-```
-
-The `--allow-unrelated-histories` is necessary because the history from the
skeleton was previously unrelated to the existing codebase. Resolve any merge
conflicts and commit to the master, and now the project is based on the shared
skeleton.
-
-## Updating
-
-Whenever a change is needed or desired for the general technique for
packaging, it can be made in the skeleton project and then merged into each of
the derived projects as needed, recommended before each release. As a result,
features and best practices for packaging are centrally maintained and readily
trickle into a whole suite of packages. This technique lowers the amount of
tedious work necessary to create or maintain a project, and coupled with other
techniques like continuous integration and deployment, lowers the cost of
creating and maintaining refined Python projects to just a few, familiar git
operations.
-
-Thereafter, the target project can make whatever customizations it deems
relevant to the scaffolding. The project may even at some point decide that the
divergence is too great to merit renewed merging with the original skeleton.
This approach applies maximal guidance while creating minimal constraints.
-
-# Features
-
-The features/techniques employed by the skeleton include:
-
-- PEP 517/518 based build relying on setuptools as the build tool
-- setuptools declarative configuration using setup.cfg
-- tox for running tests
-- A README.rst as reStructuredText with some popular badges, but with
readthedocs and appveyor badges commented out
-- A CHANGES.rst file intended for publishing release notes about the project
-- Use of [black](https://black.readthedocs.io/en/stable/) for code formatting
(disabled on unsupported Python 3.5 and earlier)
-
-## Packaging Conventions
-
-A pyproject.toml is included to enable PEP 517 and PEP 518 compatibility and
declares the requirements necessary to build the project on setuptools (a
minimum version compatible with setup.cfg declarative config).
-
-The setup.cfg file implements the following features:
-
-- Assumes universal wheel for release
-- Advertises the project's LICENSE file (MIT by default)
-- Reads the README.rst file into the long description
-- Some common Trove classifiers
-- Includes all packages discovered in the repo
-- Data files in the package are also included (not just Python files)
-- Declares the required Python versions
-- Declares install requirements (empty by default)
-- Declares setup requirements for legacy environments
-- Supplies two 'extras':
- - testing: requirements for running tests
- - docs: requirements for building docs
- - these extras split the declaration into "upstream" (requirements as
declared by the skeleton) and "local" (those specific to the local project);
these markers help avoid merge conflicts
-- Placeholder for defining entry points
-
-Additionally, the setup.py file declares `use_scm_version` which relies on
[setuptools_scm](https://pypi.org/project/setuptools_scm) to do two things:
-
-- derive the project version from SCM tags
-- ensure that all files committed to the repo are automatically included in
releases
-
-## Running Tests
-
-The skeleton assumes the developer has [tox](https://pypi.org/project/tox)
installed. The developer is expected to run `tox` to run tests on the current
Python version using [pytest](https://pypi.org/project/pytest).
-
-Other environments (invoked with `tox -e {name}`) supplied include:
-
- - a `build-docs` environment to build the documentation
- - a `release` environment to publish the package to PyPI
-
-A pytest.ini is included to define common options around running tests. In
particular:
-
-- rely on default test discovery in the current directory
-- avoid recursing into common directories not containing tests
-- run doctests on modules and invoke flake8 tests
-- in doctests, allow unicode literals and regular literals to match, allowing
for doctests to run on Python 2 and 3. Also enable ELLIPSES, a default that
would be undone by supplying the prior option.
-- filters out known warnings caused by libraries/functionality included by the
skeleton
-
-Relies a .flake8 file to correct some default behaviors:
-
-- disable mutually incompatible rules W503 and W504
-- support for black format
-
-## Continuous Integration
-
-The project is pre-configured to run tests in
[Travis-CI](https://travis-ci.org) (.travis.yml). Any new project must be
enabled either through their web site or with the `travis enable` command.
-
-Features include:
-- test against Python 2 and 3
-- run on Ubuntu Xenial
-- correct for broken IPv6
-
-Also provided is a minimal template for running under Appveyor (Windows).
-
-### Continuous Deployments
-
-In addition to running tests, an additional deploy stage is configured to
automatically release tagged commits to PyPI using [API
tokens](https://pypi.org/help/#apitoken). The release process expects an
authorized token to be configured with Travis as the TWINE_PASSWORD environment
variable. After the Travis project is created, configure the token through the
web UI or with a command like the following (bash syntax):
-
-```
-TWINE_PASSWORD={token} travis env copy TWINE_PASSWORD
-```
-
-## Building Documentation
-
-Documentation is automatically built by [Read the
Docs](https://readthedocs.org) when the project is registered with it, by way
of the .readthedocs.yml file. To test the docs build manually, a tox env may be
invoked as `tox -e build-docs`. Both techniques rely on the dependencies
declared in `setup.cfg/options.extras_require.docs`.
-
-In addition to building the sphinx docs scaffolded in `docs/`, the docs build
a `history.html` file that first injects release dates and hyperlinks into the
CHANGES.rst before incorporating it as history in the docs.
-
-## Cutting releases
-
-By default, tagged commits are released through the continuous integration
deploy stage.
-
-Releases may also be cut manually by invoking the tox environment `release`
with the PyPI token set as the TWINE_PASSWORD:
-
-```
-TWINE_PASSWORD={token} tox -e release
-```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/test_all.py
new/rst.linker-2.3.1/test_all.py
--- old/rst.linker-2.0.0/test_all.py 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/test_all.py 2022-08-26 03:10:04.000000000 +0200
@@ -1,5 +1,6 @@
-import os
import textwrap
+import subprocess
+import locale
from path import Path
import pytest
@@ -7,6 +8,14 @@
import rst.linker
+@pytest.fixture(scope='session', autouse=True)
+def stable_locale():
+ """
+ Fix locale to avoid failed tests under other locales.
+ """
+ locale.setlocale(locale.LC_ALL, 'C')
+
+
@pytest.fixture
def linker_defn():
return dict(
@@ -46,29 +55,39 @@
"""
)
repl.write_links(source, dest)
- res = dest.text()
+ res = dest.read_text()
assert 'kilnhg' in res
source.remove()
dest.remove()
-needs_git = pytest.mark.xfail(not os.path.isdir('.git'), reason="Git checkout
needed")
-
-
@pytest.fixture
def scm_defn():
return dict(
replace=[
dict(
- pattern=r"^(?m)((?P<scm_version>\d+(\.\d+){1,2}))\n-+\n",
+ pattern=r"(?m:^((?P<scm_version>\d+(\.\d+){1,2}))\n-+\n)",
with_scm="{text}\nTagged {rev[timestamp]}\n",
)
]
)
-@needs_git
-def test_scm_example(scm_defn):
+@pytest.fixture()
+def fake_git(monkeypatch):
+ def _fake_sub(cmd, *args, **kwargs):
+ if cmd[0] != 'git':
+ raise subprocess.CalledProcessError()
+ version = cmd[-1]
+ return {
+ "1.0": '2015-02-24 22:41:28 -0600',
+ "1.3": '2016-02-12 11:05:47 -0500',
+ }[version].encode()
+
+ monkeypatch.setattr(subprocess, 'check_output', _fake_sub)
+
+
+def test_scm_example(scm_defn, fake_git):
repl = rst.linker.Replacer.from_definition(scm_defn)
input = textwrap.dedent(
"""
@@ -82,8 +101,7 @@
assert 'Tagged 2015-02' in result
-@needs_git
-def test_scm_custom_date_format(scm_defn):
+def test_scm_custom_date_format(scm_defn, fake_git):
with_scm = textwrap.dedent(
"""
{text}
@@ -106,8 +124,7 @@
assert "Released 24-Feb" in result
-@needs_git
-def test_combined(scm_defn, linker_defn):
+def test_combined(scm_defn, linker_defn, fake_git):
defn = linker_defn
defn['replace'].extend(scm_defn['replace'])
repl = rst.linker.Replacer.from_definition(defn)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rst.linker-2.0.0/tox.ini new/rst.linker-2.3.1/tox.ini
--- old/rst.linker-2.0.0/tox.ini 2019-11-28 17:36:37.000000000 +0100
+++ new/rst.linker-2.3.1/tox.ini 2022-08-26 03:10:04.000000000 +0200
@@ -3,40 +3,37 @@
minversion = 3.2
# https://github.com/jaraco/skeleton/issues/6
tox_pip_extensions_ext_venv_update = true
-# Ensure that a late version of pip is used even on tox-venv.
-requires =
- tox-pip-version>=0.0.6
- tox-venv
+toxworkdir={env:TOX_WORK_DIR:.tox}
[testenv]
deps =
- setuptools>=31.0.1
-pip_version = pip
commands =
pytest {posargs}
usedevelop = True
extras = testing
-[testenv:build-docs]
+[testenv:docs]
extras =
docs
testing
changedir = docs
commands =
- python -m sphinx . {toxinidir}/build/html
+ python -m sphinx -W --keep-going . {toxinidir}/build/html
[testenv:release]
skip_install = True
deps =
- pep517>=0.5
- twine[keyring]>=1.13
- path.py
+ build
+ twine>=3
+ jaraco.develop>=7.1
passenv =
TWINE_PASSWORD
+ GITHUB_TOKEN
setenv =
TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
commands =
- python -c "import path; path.Path('dist').rmtree_p()"
- python -m pep517.build .
+ python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)"
+ python -m build
python -m twine upload dist/*
+ python -m jaraco.develop.create-github-release
