commit python-jaraco.packaging for openSUSE:Factory

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-jaraco.packaging for openSUSE:Factory checked in at 2022-08-31 18:08:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jaraco.packaging (Old) and /work/SRC/openSUSE:Factory/.python-jaraco.packaging.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jaraco.packaging" Wed Aug 31 18:08:31 2022 rev:6 rq:1000125 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jaraco.packaging/python-jaraco.packaging.changes 2021-11-21 23:51:47.838327367 +0100 +++ /work/SRC/openSUSE:Factory/.python-jaraco.packaging.new.2083/python-jaraco.packaging.changes 2022-08-31 18:08:36.075314064 +0200 @@ -1,0 +2,18 @@ +Mon Aug 29 19:50:09 UTC 2022 - Ben Greiner <code@bnavigator.de> + +- Remove stray python3.inv + +------------------------------------------------------------------- +Mon Aug 29 10:11:16 UTC 2022 - Ben Greiner <code@bnavigator.de> + +- Update to v9.0.0 + * Use pep517.meta to load package metadata. Adds support + for packages without setup.py. + * Removed info module (and setuptools show command). + * Removed depends module. Use other packaging tools instead. +- v8.2.1: Rely on PEP 420 for namespace package. +- v8.2.0: Inject rst_epilog to include ``|project|`` substitution. +- Remove jaraco.base: PEP420 namespace packages do not use that + kind of scheme anymore. + +------------------------------------------------------------------- Old: ---- jaraco.packaging-8.1.0.tar.gz python-jaraco.base.changes python-jaraco.base.spec New: ---- jaraco.packaging-9.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jaraco.packaging.spec ++++++ --- /var/tmp/diff_new_pack.FF7XBG/_old 2022-08-31 18:08:36.551315323 +0200 +++ /var/tmp/diff_new_pack.FF7XBG/_new 2022-08-31 18:08:36.555315334 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jaraco.packaging # -# Copyright (c) 2021 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 @@ -16,27 +16,31 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-jaraco.packaging -Version: 8.1.0 +Version: 9.0.0 Release: 0 Summary: Supplement packaging Python releases License: MIT URL: https://github.com/jaraco/jaraco.packaging Source: https://files.pythonhosted.org/packages/source/j/jaraco.packaging/jaraco.packaging-%{version}.tar.gz -BuildRequires: %{python_module jaraco.base >= 6.1} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} -BuildRequires: %{python_module toml} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module importlib-metadata if %python-version < 3.8} +BuildRequires: %{python_module pep517} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools >= 56} +BuildRequires: %{python_module setuptools_scm >= 3.4.1} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-jaraco.base >= 6.1 -Requires: python-six -Requires(post): update-alternatives -Requires(preun):update-alternatives +# SECTION test and docs +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module rst.linker >= 1.9} +# /SECTION +Requires: python-pep517 +%if 0%{?python_version_nodots} < 38 +Requires: python-importlib-metadata +%endif BuildArch: noarch %python_subpackages @@ -45,38 +49,23 @@ %prep %setup -q -n jaraco.packaging-%{version} -sed -i 's/--flake8//' pytest.ini -sed -i 's/--black --cov//' pytest.ini rm -rf jaraco.packaging.egg-info %build -%python_build +%pyproject_wheel %install -%python_install -# We will package the namespace __init__.py separately -%{python_expand rm %{buildroot}%{$python_sitelib}/jaraco/__init__.py* -rm -rf %{buildroot}%{$python_sitelib}/jaraco/__pycache__/ -%fdupes %{buildroot}%{$python_sitelib} -} - -%python_clone -a %{buildroot}%{_bindir}/dependency-tree - -%post -%python_install_alternative dependency-tree upload-package - -%postun -%python_uninstall_alternative dependency-tree - -%check -# the test depends on accessing PyPI -%pytest -k 'not test_revived_distribution' +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +#%%check +# Upstream removed their test suite from the repository, only checking for correct typing and lint %files %{python_files} %license LICENSE %doc docs/*.rst CHANGES.rst README.rst -%python_alternative %{_bindir}/dependency-tree -%{python_sitelib}/jaraco.packaging-%{version}-py*.egg-info +%{python_sitelib}/jaraco.packaging-%{version}*-info +%dir %{python_sitelib}/jaraco %{python_sitelib}/jaraco/packaging/ %changelog ++++++ jaraco.packaging-8.1.0.tar.gz -> jaraco.packaging-9.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.coveragerc new/jaraco.packaging-9.0.0/.coveragerc --- old/jaraco.packaging-8.1.0/.coveragerc 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.coveragerc 2022-02-11 03:55:53.000000000 +0100 @@ -1,5 +1,7 @@ [run] -omit = .tox/* +omit = + # leading `*/` for pytest-dev/pytest-cov#456 + */.tox/* [report] show_missing = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.editorconfig new/jaraco.packaging-9.0.0/.editorconfig --- old/jaraco.packaging-8.1.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.editorconfig 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,16 @@ +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.flake8 new/jaraco.packaging-9.0.0/.flake8 --- old/jaraco.packaging-8.1.0/.flake8 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.flake8 2022-02-11 03:55:53.000000000 +0100 @@ -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/jaraco.packaging-8.1.0/.github/dependabot.yml new/jaraco.packaging-9.0.0/.github/dependabot.yml --- old/jaraco.packaging-8.1.0/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.github/dependabot.yml 2022-02-11 03:55:53.000000000 +0100 @@ -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/jaraco.packaging-8.1.0/.github/workflows/main.yml new/jaraco.packaging-9.0.0/.github/workflows/main.yml --- old/jaraco.packaging-8.1.0/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.github/workflows/main.yml 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,48 @@ +name: tests + +on: [push, pull_request] + +jobs: + test: + strategy: + matrix: + python: + - 3.7 + - 3.9 + - "3.10" + platform: + - ubuntu-latest + - macos-latest + - windows-latest + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + - name: Install tox + run: | + python -m pip install tox + - name: Run tests + run: tox + + release: + needs: test + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - 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/jaraco.packaging-8.1.0/.pre-commit-config.yaml new/jaraco.packaging-9.0.0/.pre-commit-config.yaml --- old/jaraco.packaging-8.1.0/.pre-commit-config.yaml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.pre-commit-config.yaml 2022-02-11 03:55:53.000000000 +0100 @@ -1,10 +1,5 @@ repos: - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 20.8b1 hooks: - id: black - -- repo: https://github.com/asottile/blacken-docs - rev: v1.4.0 - hooks: - - id: blacken-docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/.readthedocs.yml new/jaraco.packaging-9.0.0/.readthedocs.yml --- old/jaraco.packaging-8.1.0/.readthedocs.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.readthedocs.yml 2022-02-11 03:55:53.000000000 +0100 @@ -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/jaraco.packaging-8.1.0/.travis.yml new/jaraco.packaging-9.0.0/.travis.yml --- old/jaraco.packaging-8.1.0/.travis.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -dist: xenial -language: python - -python: -- 3.6 -- &latest_py3 3.8 - -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/jaraco.packaging-8.1.0/CHANGES.rst new/jaraco.packaging-9.0.0/CHANGES.rst --- old/jaraco.packaging-8.1.0/CHANGES.rst 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/CHANGES.rst 2022-02-11 03:55:53.000000000 +0100 @@ -1,3 +1,28 @@ +v9.0.0 +====== + +Use pep517.meta to load package metadata. Adds support +for packages without setup.py. + +Removed info module (and setuptools show command). + +Removed depends module. Use other packaging tools instead. + +v8.2.1 +====== + +Rely on PEP 420 for namespace package. + +v8.2.0 +====== + +Inject rst_epilog to include ``|project|`` substitution. + +v8.1.1 +====== + +Refresh package metadata. + v8.1.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/PKG-INFO new/jaraco.packaging-9.0.0/PKG-INFO --- old/jaraco.packaging-8.1.0/PKG-INFO 2020-02-16 16:58:31.906517500 +0100 +++ new/jaraco.packaging-9.0.0/PKG-INFO 2022-02-11 03:56:17.035524400 +0100 @@ -1,96 +1,11 @@ Metadata-Version: 2.1 Name: jaraco.packaging -Version: 8.1.0 +Version: 9.0.0 Summary: tools to supplement packaging Python releases Home-page: https://github.com/jaraco/jaraco.packaging Author: Jason R. Coombs Author-email: jaraco@jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.packaging.svg - :target: `PyPI link`_ - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg - :target: `PyPI link`_ - - .. _PyPI link: https://pypi.org/project/jaraco.packaging - - .. image:: https://dev.azure.com/jaraco/jaraco.packaging/_apis/build/status/jaraco.jara... - :target: https://dev.azure.com/jaraco/jaraco.packaging/_build/latest?definitionId=1&branchName=master - - .. image:: https://img.shields.io/travis/jaraco/jaraco.packaging/master.svg - :target: https://travis-ci.org/jaraco/jaraco.packaging - - .. 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/jaraco-packaging/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/jaraco-packaging/branch/master - - .. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest - :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest - - Tools for packaging. - - dependency_tree - =============== - - A distutils command for reporting the dependency tree as resolved - by setuptools. Use after installing a package. - - show - ==== - - A distutils command for reporting the attributes of a distribution, - such as the version or author name. Here are some examples against - this package:: - - $ python -q setup.py show - jaraco.packaging 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes version - 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes author,author_email - "Jason R. Coombs" jaraco@jaraco.com - $ python setup.py -q show --attributes classifiers - "['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3']" - $ python setup.py -q show --attributes "description url" - "tools to supplement packaging Python releases" https://bitbucket.org/jaraco/jaraco.packaging - - Note that passing -q suppresses the "running show" message. - - Attributes may be specified as comma-separated or space-separated keys. - Results are printed using ``subprocess.list2cmdline`` so may be parsed using - ``shlex.split``. By default, 'name' and 'version' are printed. - - sphinx - ====== - - This package provides a Sphinx extension that will inject into the config - the following values from the project's package metadata (as presented by - distutils): - - - project (from name) - - author - - copyright (same as author) - - version - - release (same as version) - - package_url (from url) - - To enable, include 'jaraco.packaging' in your requirements and add - 'jaraco.packaging.sphinx' to your list of extensions in your config file:: - - extensions=['jaraco.packaging.sphinx'] - - make-tree - ========= - - A utility for taking output from ``pipdeptree --json`` and producing a tree - rooted at a given package. - - Usage:: - - pipdeptree --json | python -m jaraco.packaging.make-tree mypkg - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers @@ -98,6 +13,62 @@ 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/jaraco.packaging.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.packaging + +.. image:: https://github.com/jaraco/jaraco.packaging/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.packaging/actions?query=workflow%3A%22tests... + :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/jaracopackaging/badge/?version=latest + :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +Tools for packaging. + +sphinx +====== + +This package provides a Sphinx extension that will inject into the config +the following values from the project's package metadata (as presented by +distutils): + + - project (from name) + - author + - copyright (same as author) + - version + - release (same as version) + - package_url (from url) + +To enable, include 'jaraco.packaging' in your requirements and add +'jaraco.packaging.sphinx' to your list of extensions in your config file:: + + extensions=['jaraco.packaging.sphinx'] + +make-tree +========= + +A utility for taking output from ``pipdeptree --json`` and producing a tree +rooted at a given package. + +Usage:: + + pipdeptree --json | python -m jaraco.packaging.make-tree mypkg + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/README.rst new/jaraco.packaging-9.0.0/README.rst --- old/jaraco.packaging-8.1.0/README.rst 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/README.rst 2022-02-11 03:55:53.000000000 +0100 @@ -6,53 +6,21 @@ .. _PyPI link: https://pypi.org/project/jaraco.packaging -.. image:: https://dev.azure.com/jaraco/jaraco.packaging/_apis/build/status/jaraco.jara... - :target: https://dev.azure.com/jaraco/jaraco.packaging/_build/latest?definitionId=1&branchName=master - -.. image:: https://img.shields.io/travis/jaraco/jaraco.packaging/master.svg - :target: https://travis-ci.org/jaraco/jaraco.packaging +.. image:: https://github.com/jaraco/jaraco.packaging/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.packaging/actions?query=workflow%3A%22tests... + :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/jaraco-packaging/master.svg -.. :target: https://ci.appveyor.com/project/jaraco/jaraco-packaging/branch/master - .. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest -Tools for packaging. - -dependency_tree -=============== +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton -A distutils command for reporting the dependency tree as resolved -by setuptools. Use after installing a package. - -show -==== - -A distutils command for reporting the attributes of a distribution, -such as the version or author name. Here are some examples against -this package:: - - $ python -q setup.py show - jaraco.packaging 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes version - 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes author,author_email - "Jason R. Coombs" jaraco@jaraco.com - $ python setup.py -q show --attributes classifiers - "['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3']" - $ python setup.py -q show --attributes "description url" - "tools to supplement packaging Python releases" https://bitbucket.org/jaraco/jaraco.packaging - -Note that passing -q suppresses the "running show" message. - -Attributes may be specified as comma-separated or space-separated keys. -Results are printed using ``subprocess.list2cmdline`` so may be parsed using -``shlex.split``. By default, 'name' and 'version' are printed. +Tools for packaging. sphinx ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/appveyor.yml new/jaraco.packaging-9.0.0/appveyor.yml --- old/jaraco.packaging-8.1.0/appveyor.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -environment: - - APPVEYOR: true - - matrix: - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python38-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/jaraco.packaging-8.1.0/azure-pipelines.yml new/jaraco.packaging-9.0.0/azure-pipelines.yml --- old/jaraco.packaging-8.1.0/azure-pipelines.yml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/azure-pipelines.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -# Create the project in Azure with: -# az devops project create --name $name --organization https://dev.azure.com/$org/ --visibility public -# then configure the pipelines (through web UI) - -trigger: - branches: - include: - - '*' - tags: - include: - - '*' - -pool: - vmimage: 'Ubuntu-18.04' - -variables: -- group: Azure secrets - -stages: -- stage: Test - jobs: - - - job: 'Test' - strategy: - matrix: - Python36: - python.version: '3.6' - Python38: - python.version: '3.8' - maxParallel: 4 - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '$(python.version)' - architecture: 'x64' - - - script: python -m pip install tox - displayName: 'Install tox' - - - script: | - tox -- --junit-xml=test-results.xml - displayName: 'run tests' - - - task: PublishTestResults@2 - inputs: - testResultsFiles: '**/test-results.xml' - testRunTitle: 'Python $(python.version)' - condition: succeededOrFailed() - -- stage: Publish - dependsOn: Test - jobs: - - job: 'Publish' - - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.8' - architecture: 'x64' - - - script: python -m pip install tox - displayName: 'Install tox' - - - script: | - tox -e release - env: - TWINE_PASSWORD: $(PyPI-token) - displayName: 'publish to PyPI' - - condition: contains(variables['Build.SourceBranch'], 'tags') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/docs/conf.py new/jaraco.packaging-9.0.0/docs/conf.py --- old/jaraco.packaging-8.1.0/docs/conf.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/docs/conf.py 2022-02-11 03:55:53.000000000 +0100 @@ -14,7 +14,7 @@ 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( @@ -24,3 +24,13 @@ ], ) } + +# 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/jaraco.packaging-8.1.0/docs/index.rst new/jaraco.packaging-9.0.0/docs/index.rst --- old/jaraco.packaging-8.1.0/docs/index.rst 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/docs/index.rst 2022-02-11 03:55:53.000000000 +0100 @@ -1,5 +1,5 @@ -Welcome to jaraco.packaging documentation! -========================================== +Welcome to |project| documentation! +=================================== .. toctree:: :maxdepth: 1 @@ -11,21 +11,6 @@ :members: :undoc-members: :show-inheritance: - -.. automodule:: jaraco.packaging.cheese - :members: - :undoc-members: - :show-inheritance: - -.. automodule:: jaraco.packaging.depends - :members: - :undoc-members: - :show-inheritance: - -.. automodule:: jaraco.packaging.info - :members: - :undoc-members: - :show-inheritance: .. automodule:: jaraco.packaging.sphinx :members: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/__init__.py new/jaraco.packaging-9.0.0/jaraco/__init__.py --- old/jaraco.packaging-8.1.0/jaraco/__init__.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/packaging/depends.py new/jaraco.packaging-9.0.0/jaraco/packaging/depends.py --- old/jaraco.packaging-8.1.0/jaraco/packaging/depends.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/packaging/depends.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,119 +0,0 @@ -""" -This module should only import modules from stdlib and setuptools -""" - -from __future__ import print_function, unicode_literals - -import os -import re -import argparse -import subprocess - -import setuptools -import pkg_resources - -text_type = getattr(__builtins__, 'unicode', str) - -req_help = "A setuptools requirement spec (e.g. 'eggmonster' or " "'eggmonster==0.1')" -python_help = "Use a remote environment rather than the local one." - - -def tree_cmd(): - parser = argparse.ArgumentParser() - parser.add_argument('requirement', help=req_help) - parser.add_argument('--python', help=python_help) - args = parser.parse_args() - if args.python: - return check_dependencies_remote(args) - check_dependencies(args.requirement) - - -def print_package(requirement, indent): - r = requirement - print(' ' * indent + str(r), '[{0}]'.format(pkg_resources.get_distribution(r))) - - -def parse_extras(req): - pattern = re.compile(r'\[(.*)\]') - res = pattern.search(text_type(req)) - return res.group(1).split(',') if res else [] - - -def check_dependencies(req, indent=1, history=None): - """ - Given a setuptools package requirement (e.g. 'gryphon==2.42' or just - 'gryphon'), print a tree of dependencies as they resolve in this - environment. - """ - # keep a history to avoid infinite loops - if history is None: - history = set() - if req in history: - return - history.add(req) - d = pkg_resources.get_distribution(req) - extras = parse_extras(req) - if indent == 1: - print_package(req, 0) - for r in d.requires(extras=extras): - print_package(r, indent) - check_dependencies(r, indent + 1, history) - - -def load_dependencies(req, history=None): - """ - Load the dependency tree as a Python object tree, - suitable for JSON serialization. - - >>> deps = load_dependencies('jaraco.packaging') - >>> import json - >>> doc = json.dumps(deps) - """ - if history is None: - history = set() - dist = pkg_resources.get_distribution(req) - spec = dict(requirement=str(req), resolved=str(dist)) - if req not in history: - # traverse into children - history.add(req) - extras = parse_extras(req) - depends = [ - load_dependencies(dep, history=history) - for dep in dist.requires(extras=extras) - ] - if depends: - spec.update(depends=depends) - return spec - - -class DependencyTree(setuptools.Command): - description = "Report a tree of resolved dependencies" - user_options = [ - (str('requirement='), str('r'), req_help), - (str('python='), str('p'), python_help), - ] - - def finalize_options(self): - pass - - def initialize_options(self): - self.requirement = self.distribution.get_name() - self.python = None - - def run(self): - if self.python: - return check_dependencies_remote(self) - check_dependencies(self.requirement) - - -def check_dependencies_remote(args): - """ - Invoke this command on a remote Python. - """ - cmd = [args.python, '-m', 'depends', args.requirement] - env = dict(PYTHONPATH=os.path.dirname(__file__)) - return subprocess.check_call(cmd, env=env) - - -if __name__ == '__main__': - tree_cmd() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/packaging/info.py new/jaraco.packaging-9.0.0/jaraco/packaging/info.py --- old/jaraco.packaging-8.1.0/jaraco/packaging/info.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/packaging/info.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -from __future__ import print_function - -import subprocess -import re - -import six - -import setuptools - - -class Show(setuptools.Command): - """ - >>> import sys, functools - >>> show_cmd = [sys.executable, "setup.py", "show"] - >>> run = functools.partial( - ... subprocess.check_output, universal_newlines=True) - >>> print(run(show_cmd + ['-a', 'name']), end='') - running show - jaraco.packaging - >>> print(run(show_cmd + ['-a', 'install_requires']), end='') - running show - "['six>=1.4', 'setuptools']" - """ - - description = "Report attributes of a distribution's metadata" - user_options = [ - (str('attributes='), str('a'), "space or comma-separated attributes") - ] - - def finalize_options(self): - if isinstance(self.attributes, six.string_types): - self.attributes = re.split('[, ]', self.attributes) - - def initialize_options(self): - self.attributes = 'name', 'version' - - def _lookup_attribute(self, attr_name): - return self._by_getter(attr_name) or self._by_attr(attr_name) - - def _by_attr(self, attr_name): - return getattr(self.distribution, attr_name) - - def _by_getter(self, attr_name): - method_name = 'get_' + attr_name - try: - method = getattr(self.distribution, method_name) - except AttributeError: - return - return method() - - def run(self): - values = map(self._lookup_attribute, self.attributes) - str_values = map(str, values) - print(subprocess.list2cmdline(str_values)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco/packaging/sphinx.py new/jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py --- old/jaraco.packaging-8.1.0/jaraco/packaging/sphinx.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco/packaging/sphinx.py 2022-02-11 03:55:53.000000000 +0100 @@ -1,22 +1,21 @@ -from __future__ import unicode_literals - import os -import sys import subprocess +import pep517.meta try: import importlib.metadata as imp_meta except ImportError: - import importlib_metadata as imp_meta + import importlib_metadata as imp_meta # type: ignore if 'check_output' not in dir(subprocess): - import subprocess32 as subprocess + import subprocess32 as subprocess # type: ignore def setup(app): app.add_config_value('package_url', '', '') app.connect('builder-inited', load_config_from_setup) + app.connect('builder-inited', configure_substitutions) app.connect('html-page-context', add_package_url) return dict(version=imp_meta.version('jaraco.packaging'), parallel_read_safe=True) @@ -27,19 +26,16 @@ """ # for now, assume project root is one level up root = os.path.join(app.confdir, '..') - setup_script = os.path.join(root, 'setup.py') - fields = ['--name', '--version', '--url', '--author'] - dist_info_cmd = [sys.executable, setup_script] + fields - output = subprocess.check_output(dist_info_cmd, cwd=root, universal_newlines=True) - outputs = output.strip().split('\n') - try: - project, version, url, author = outputs - except ValueError: - raise ValueError("Unexpected metadata output", output) - app.config.project = project - app.config.version = app.config.release = version - app.config.package_url = url - app.config.author = app.config.copyright = author + meta = pep517.meta.load(root).metadata + app.config.project = meta['Name'] + app.config.version = app.config.release = meta['Version'] + app.config.package_url = meta['Home-page'] + app.config.author = app.config.copyright = meta['Author'] + + +def configure_substitutions(app): + epilogs = app.config.rst_epilog, f'.. |project| replace:: {app.config.project}' + app.config.rst_epilog = '\n'.join(filter(None, epilogs)) def add_package_url(app, pagename, templatename, context, doctree): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/PKG-INFO new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/PKG-INFO --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/PKG-INFO 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/PKG-INFO 2022-02-11 03:56:17.000000000 +0100 @@ -1,96 +1,11 @@ Metadata-Version: 2.1 Name: jaraco.packaging -Version: 8.1.0 +Version: 9.0.0 Summary: tools to supplement packaging Python releases Home-page: https://github.com/jaraco/jaraco.packaging Author: Jason R. Coombs Author-email: jaraco@jaraco.com License: UNKNOWN -Description: .. image:: https://img.shields.io/pypi/v/jaraco.packaging.svg - :target: `PyPI link`_ - - .. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg - :target: `PyPI link`_ - - .. _PyPI link: https://pypi.org/project/jaraco.packaging - - .. image:: https://dev.azure.com/jaraco/jaraco.packaging/_apis/build/status/jaraco.jara... - :target: https://dev.azure.com/jaraco/jaraco.packaging/_build/latest?definitionId=1&branchName=master - - .. image:: https://img.shields.io/travis/jaraco/jaraco.packaging/master.svg - :target: https://travis-ci.org/jaraco/jaraco.packaging - - .. 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/jaraco-packaging/master.svg - .. :target: https://ci.appveyor.com/project/jaraco/jaraco-packaging/branch/master - - .. image:: https://readthedocs.org/projects/jaracopackaging/badge/?version=latest - :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest - - Tools for packaging. - - dependency_tree - =============== - - A distutils command for reporting the dependency tree as resolved - by setuptools. Use after installing a package. - - show - ==== - - A distutils command for reporting the attributes of a distribution, - such as the version or author name. Here are some examples against - this package:: - - $ python -q setup.py show - jaraco.packaging 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes version - 2.8.2.dev1+nfaae9fb96b36.d20151127 - $ python -q setup.py show --attributes author,author_email - "Jason R. Coombs" jaraco@jaraco.com - $ python setup.py -q show --attributes classifiers - "['Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3']" - $ python setup.py -q show --attributes "description url" - "tools to supplement packaging Python releases" https://bitbucket.org/jaraco/jaraco.packaging - - Note that passing -q suppresses the "running show" message. - - Attributes may be specified as comma-separated or space-separated keys. - Results are printed using ``subprocess.list2cmdline`` so may be parsed using - ``shlex.split``. By default, 'name' and 'version' are printed. - - sphinx - ====== - - This package provides a Sphinx extension that will inject into the config - the following values from the project's package metadata (as presented by - distutils): - - - project (from name) - - author - - copyright (same as author) - - version - - release (same as version) - - package_url (from url) - - To enable, include 'jaraco.packaging' in your requirements and add - 'jaraco.packaging.sphinx' to your list of extensions in your config file:: - - extensions=['jaraco.packaging.sphinx'] - - make-tree - ========= - - A utility for taking output from ``pipdeptree --json`` and producing a tree - rooted at a given package. - - Usage:: - - pipdeptree --json | python -m jaraco.packaging.make-tree mypkg - Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers @@ -98,6 +13,62 @@ 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/jaraco.packaging.svg + :target: `PyPI link`_ + +.. image:: https://img.shields.io/pypi/pyversions/jaraco.packaging.svg + :target: `PyPI link`_ + +.. _PyPI link: https://pypi.org/project/jaraco.packaging + +.. image:: https://github.com/jaraco/jaraco.packaging/workflows/tests/badge.svg + :target: https://github.com/jaraco/jaraco.packaging/actions?query=workflow%3A%22tests... + :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/jaracopackaging/badge/?version=latest + :target: https://jaracopackaging.readthedocs.io/en/latest/?badge=latest + +.. image:: https://img.shields.io/badge/skeleton-2022-informational + :target: https://blog.jaraco.com/skeleton + +Tools for packaging. + +sphinx +====== + +This package provides a Sphinx extension that will inject into the config +the following values from the project's package metadata (as presented by +distutils): + + - project (from name) + - author + - copyright (same as author) + - version + - release (same as version) + - package_url (from url) + +To enable, include 'jaraco.packaging' in your requirements and add +'jaraco.packaging.sphinx' to your list of extensions in your config file:: + + extensions=['jaraco.packaging.sphinx'] + +make-tree +========= + +A utility for taking output from ``pipdeptree --json`` and producing a tree +rooted at a given package. + +Usage:: + + pipdeptree --json | python -m jaraco.packaging.make-tree mypkg + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/SOURCES.txt new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/SOURCES.txt --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/SOURCES.txt 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/SOURCES.txt 2022-02-11 03:56:17.000000000 +0100 @@ -1,31 +1,26 @@ .coveragerc +.editorconfig .flake8 .pre-commit-config.yaml .readthedocs.yml -.travis.yml CHANGES.rst LICENSE README.rst -appveyor.yml -azure-pipelines.yml +mypy.ini pyproject.toml pytest.ini setup.cfg -setup.py -skeleton.md tox.ini +.github/dependabot.yml +.github/workflows/main.yml docs/conf.py docs/history.rst docs/index.rst -jaraco/__init__.py jaraco.packaging.egg-info/PKG-INFO jaraco.packaging.egg-info/SOURCES.txt jaraco.packaging.egg-info/dependency_links.txt -jaraco.packaging.egg-info/entry_points.txt jaraco.packaging.egg-info/requires.txt jaraco.packaging.egg-info/top_level.txt jaraco/packaging/__init__.py -jaraco/packaging/depends.py -jaraco/packaging/info.py jaraco/packaging/make-tree.py jaraco/packaging/sphinx.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/entry_points.txt new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/entry_points.txt --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/entry_points.txt 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/entry_points.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[console_scripts] -dependency-tree = jaraco.packaging.depends:tree_cmd - -[distutils.commands] -dependency_tree = jaraco.packaging.depends:DependencyTree -show = jaraco.packaging.info:Show - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/requires.txt new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/requires.txt --- old/jaraco.packaging-8.1.0/jaraco.packaging.egg-info/requires.txt 2020-02-16 16:58:31.000000000 +0100 +++ new/jaraco.packaging-9.0.0/jaraco.packaging.egg-info/requires.txt 2022-02-11 03:56:17.000000000 +0100 @@ -1,17 +1,20 @@ -six>=1.4 -setuptools +pep517 [:python_version < "3.8"] importlib_metadata [docs] sphinx -jaraco.packaging>=3.2 +jaraco.packaging>=8.2 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 pytest-cov +pytest-enabler>=1.0.1 + +[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/jaraco.packaging-8.1.0/mypy.ini new/jaraco.packaging-9.0.0/mypy.ini --- old/jaraco.packaging-8.1.0/mypy.ini 1970-01-01 01:00:00.000000000 +0100 +++ new/jaraco.packaging-9.0.0/mypy.ini 2022-02-11 03:55:53.000000000 +0100 @@ -0,0 +1,2 @@ +[mypy] +ignore_missing_imports = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/pyproject.toml new/jaraco.packaging-9.0.0/pyproject.toml --- old/jaraco.packaging-8.1.0/pyproject.toml 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/pyproject.toml 2022-02-11 03:55:53.000000000 +0100 @@ -1,8 +1,20 @@ [build-system] -requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"] +requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"] build-backend = "setuptools.build_meta" [tool.black] skip-string-normalization = true [tool.setuptools_scm] + +[pytest.enabler.black] +addopts = "--black" + +[pytest.enabler.mypy] +addopts = "--mypy" + +[pytest.enabler.flake8] +addopts = "--flake8" + +[pytest.enabler.cov] +addopts = "--cov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/pytest.ini new/jaraco.packaging-9.0.0/pytest.ini --- old/jaraco.packaging-8.1.0/pytest.ini 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/pytest.ini 2022-02-11 03:55:53.000000000 +0100 @@ -1,7 +1,15 @@ [pytest] norecursedirs=dist build .tox .eggs -addopts=--doctest-modules --flake8 --black --cov +addopts=--doctest-modules doctest_optionflags=ALLOW_UNICODE ELLIPSIS filterwarnings= - # workaround for https://github.com/pypa/setuptools/issues/479 - ignore:::setuptools.depends:2 + # 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 + + # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/setup.cfg new/jaraco.packaging-9.0.0/setup.cfg --- old/jaraco.packaging-8.1.0/setup.cfg 2020-02-16 16:58:31.906517500 +0100 +++ new/jaraco.packaging-9.0.0/setup.cfg 2022-02-11 03:56:17.039524600 +0100 @@ -1,5 +1,4 @@ [metadata] -license_file = LICENSE name = jaraco.packaging author = Jason R. Coombs author_email = jaraco@jaraco.com @@ -14,37 +13,38 @@ Programming Language :: Python :: 3 :: Only Framework :: Sphinx :: Extension -[bdist_wheel] -python-tag = py36 - [options] -packages = find: +packages = find_namespace: include_package_data = true -python_requires = >=3.6 +python_requires = >=3.7 install_requires = - six >= 1.4 - setuptools importlib_metadata; python_version < "3.8" -setup_requires = setuptools_scm[toml] >= 3.4.1 + pep517 + +[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 + pytest-black >= 0.3.7; \ + python_implementation != "PyPy" pytest-cov + pytest-mypy >= 0.9.1; \ + python_implementation != "PyPy" + pytest-enabler >= 1.0.1 docs = sphinx - jaraco.packaging >= 3.2 + jaraco.packaging >= 8.2 rst.linker >= 1.9 [options.entry_points] -console_scripts = - dependency-tree=jaraco.packaging.depends:tree_cmd -distutils.commands = - dependency_tree=jaraco.packaging.depends:DependencyTree - show=jaraco.packaging.info:Show [egg_info] tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/setup.py new/jaraco.packaging-9.0.0/setup.py --- old/jaraco.packaging-8.1.0/setup.py 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/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() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaraco.packaging-8.1.0/skeleton.md new/jaraco.packaging-9.0.0/skeleton.md --- old/jaraco.packaging-8.1.0/skeleton.md 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/skeleton.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,161 +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/12eed1326e1bc26ce256e7b3f8cd8d3a5b...) 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 Read the Docs 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 `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 on 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 through multiple CI providers. - -### Azure Pipelines - -[Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/) are the preferred provider as they provide free, fast, multi-platform services. See azure-pipelines.yml for more details. - -Features include: - -- test against multiple Python versions -- run on Ubuntu Bionic - -### Travis CI - -[Travis CI](https://travis-ci.org) is configured through .travis.yml. Any new project must be enabled either through their web site or with the `travis enable` command. - -Features include: -- test against Python 3 -- run on Ubuntu Xenial -- correct for broken IPv6 - -### AppVeyor - -A minimal template for running under AppVeyor (Windows) is provided. - -### 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 Azure as the `Azure secrets` variable group. This variable group needs to be created only once per organization. For example: - -``` -# create a resource group if none exists -az group create --name main --location eastus2 -# create the vault (try different names until something works) -az keyvault create --name secrets007 --resource-group main -# create the secret -az keyvault secret set --vault-name secrets007 --name PyPI-token --value $token -``` - -Then, in the web UI for the project's Pipelines Library, create the `Azure secrets` variable group referencing the key vault name. - -For more details, see [this blog entry](https://blog.jaraco.com/configuring-azure-pipelines-with-secets/). - -## 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 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/jaraco.packaging-8.1.0/tox.ini new/jaraco.packaging-9.0.0/tox.ini --- old/jaraco.packaging-8.1.0/tox.ini 2020-02-16 16:58:09.000000000 +0100 +++ new/jaraco.packaging-9.0.0/tox.ini 2022-02-11 03:55:53.000000000 +0100 @@ -3,15 +3,11 @@ 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 = -pip_version = pip commands = pytest {posargs} usedevelop = True @@ -23,19 +19,21 @@ 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 + 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