Skip to content

Commit b45d144

Browse files
committed
Merge branch 'master' into group-dev-docs
2 parents ab7fa51 + 97253c8 commit b45d144

34 files changed

+356
-349
lines changed

.github/workflows/python-tests.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
# max-parallel: 5
2020
matrix:
2121
python-version:
22+
- 3.9
2223
- 3.8
2324
- pypy3
2425
- 3.7
@@ -31,12 +32,6 @@ jobs:
3132
# - windows-2019
3233
# - windows-2016
3334
include:
34-
# Pre-release versions (GH-shipped)
35-
- os: ubuntu-20.04
36-
python-version: 3.9.0-beta.4 - 3.9.0
37-
# Pre-release versions (deadsnakes)
38-
- os: ubuntu-20.04
39-
python-version: 3.9-beta
4035
# Dev versions (deadsnakes)
4136
- os: ubuntu-20.04
4237
python-version: 3.9-dev

CHANGES.rst

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ v50.2.0
2222

2323
* #2355: When pip is imported as part of a build, leave distutils patched.
2424
* #2380: There are some setuptools specific changes in the
25-
`setuptools.command.bdist_rpm` module that are no longer needed, because
26-
they are part of the `bdist_rpm` module in distutils in Python
27-
3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
25+
``setuptools.command.bdist_rpm`` module that are no longer needed, because
26+
they are part of the ``bdist_rpm`` module in distutils in Python
27+
3.5.0. Therefore, code was removed from ``setuptools.command.bdist_rpm``.
2828

2929

3030
v50.1.0
@@ -48,7 +48,7 @@ v50.0.2
4848
v50.0.1
4949
-------
5050

51-
* #2357: Restored Python 3.5 support in distutils.util for missing `subprocess._optim_args_from_interpreter_flags`.
51+
* #2357: Restored Python 3.5 support in distutils.util for missing ``subprocess._optim_args_from_interpreter_flags``.
5252
* #2358: Restored AIX support on Python 3.8 and earlier.
5353
* #2361: Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class
5454
from importlib.abc rather than importlib.util.abc (alias removed in Python
@@ -495,7 +495,7 @@ v40.7.1
495495
v40.7.0
496496
-------
497497

498-
* #1551: File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.
498+
* #1551: File inputs for the ``license`` field in ``setup.cfg`` files now explicitly raise an error.
499499
* #1180: Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
500500
* #1499: ``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
501501
* #1544: Added tests for PackageIndex.download (for git URLs).
@@ -545,7 +545,7 @@ v40.5.0
545545

546546
* #1335: In ``pkg_resources.normalize_path``, fix issue on Cygwin when cwd contains symlinks.
547547
* #1502: Deprecated support for downloads from Subversion in package_index/easy_install.
548-
* #1517: Dropped use of six.u in favor of `u""` literals.
548+
* #1517: Dropped use of six.u in favor of ``u""`` literals.
549549
* #1520: Added support for ``data_files`` in ``setup.cfg``.
550550
* #1525: Fixed rendering of the deprecation warning in easy_install doc.
551551

@@ -594,7 +594,7 @@ v40.2.0
594594
v40.1.1
595595
--------
596596

597-
* #1465: Fix regression with `egg_info` command when tagging is used.
597+
* #1465: Fix regression with ``egg_info`` command when tagging is used.
598598

599599

600600
v40.1.0
@@ -631,8 +631,8 @@ v39.2.0
631631
a text file.
632632
* #1360: Fixed issue with a mismatch between the name of the package and the
633633
name of the .dist-info file in wheel files
634-
* #1364: Add `__dir__()` implementation to `pkg_resources.Distribution()` that
635-
includes the attributes in the `_provider` instance variable.
634+
* #1364: Add ``__dir__()`` implementation to ``pkg_resources.Distribution()`` that
635+
includes the attributes in the ``_provider`` instance variable.
636636
* #1365: Take the package_dir option into account when loading the version from
637637
a module attribute.
638638
* #1353: Added coverage badge to README.
@@ -742,7 +742,7 @@ v38.2.5
742742
v38.2.4
743743
-------
744744

745-
* #1220: Fix `data_files` handling when installing from wheel.
745+
* #1220: Fix ``data_files`` handling when installing from wheel.
746746

747747
v38.2.3
748748
-------
@@ -1506,7 +1506,7 @@ v25.4.0
15061506
v25.3.0
15071507
-------
15081508

1509-
* #739 Fix unquoted libpaths by fixing compatibility between `numpy.distutils` and `distutils._msvccompiler` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy).
1509+
* #739 Fix unquoted libpaths by fixing compatibility between ``numpy.distutils`` and ``distutils._msvccompiler`` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy).
15101510

15111511
* #731: Bump certifi.
15121512

@@ -1523,21 +1523,21 @@ v25.2.0
15231523
v25.1.6
15241524
-------
15251525

1526-
* #725: revert `library_dir_option` patch (Error is related to `numpy.distutils` and make errors on non Numpy users).
1526+
* #725: revert ``library_dir_option`` patch (Error is related to ``numpy.distutils`` and make errors on non Numpy users).
15271527

15281528
v25.1.5
15291529
-------
15301530

15311531
* #720
1532-
* #723: Improve patch for `library_dir_option`.
1532+
* #723: Improve patch for ``library_dir_option``.
15331533

15341534
v25.1.4
15351535
-------
15361536

15371537
* #717
15381538
* #713
15391539
* #707: Fix Python 2 compatibility for MSVC by catching errors properly.
1540-
* #715: Fix unquoted libpaths by patching `library_dir_option`.
1540+
* #715: Fix unquoted libpaths by patching ``library_dir_option``.
15411541

15421542
v25.1.3
15431543
-------
@@ -3065,32 +3065,32 @@ not all users will find 1.0 a drop-in replacement for 0.9.
30653065

30663066
* Issue #50: Normalized API of environment marker support. Specifically,
30673067
removed line number and filename from SyntaxErrors when returned from
3068-
`pkg_resources.invalid_marker`. Any clients depending on the specific
3068+
``pkg_resources.invalid_marker``. Any clients depending on the specific
30693069
string representation of exceptions returned by that function may need to
30703070
be updated to account for this change.
3071-
* Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
3071+
* Issue #50: SyntaxErrors generated by ``pkg_resources.invalid_marker`` are
30723072
normalized for cross-implementation consistency.
30733073
* Removed ``--ignore-conflicts-at-my-risk`` and ``--delete-conflicting``
30743074
options to easy_install. These options have been deprecated since 0.6a11.
30753075

30763076
0.9.8
30773077
-----
30783078

3079-
* Issue #53: Fix NameErrors in `_vcs_split_rev_from_url`.
3079+
* Issue #53: Fix NameErrors in ``_vcs_split_rev_from_url``.
30803080

30813081
0.9.7
30823082
-----
30833083

30843084
* Issue #49: Correct AttributeError on PyPy where a hashlib.HASH object does
3085-
not have a `.name` attribute.
3085+
not have a ``.name`` attribute.
30863086
* Issue #34: Documentation now refers to bootstrap script in code repository
30873087
referenced by bookmark.
30883088
* Add underscore-separated keys to environment markers (markerlib).
30893089

30903090
0.9.6
30913091
-----
30923092

3093-
* Issue #44: Test failure on Python 2.4 when MD5 hash doesn't have a `.name`
3093+
* Issue #44: Test failure on Python 2.4 when MD5 hash doesn't have a ``.name``
30943094
attribute.
30953095

30963096
0.9.5
@@ -3124,7 +3124,7 @@ not all users will find 1.0 a drop-in replacement for 0.9.
31243124
0.9
31253125
---
31263126

3127-
* `package_index` now validates hashes other than MD5 in download links.
3127+
* ``package_index`` now validates hashes other than MD5 in download links.
31283128

31293129
0.8
31303130
---
@@ -3171,7 +3171,7 @@ not all users will find 1.0 a drop-in replacement for 0.9.
31713171
0.7.2
31723172
-----
31733173

3174-
* Issue #14: Use markerlib when the `parser` module is not available.
3174+
* Issue #14: Use markerlib when the ``parser`` module is not available.
31753175
* Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.
31763176

31773177
0.7.1
@@ -3255,7 +3255,7 @@ Added several features that were slated for setuptools 0.6c12:
32553255
------
32563256

32573257
* Distribute #27: Use public api for loading resources from zip files rather than
3258-
the private method `_zip_directory_cache`.
3258+
the private method ``_zip_directory_cache``.
32593259
* Added a new function ``easy_install.get_win_launcher`` which may be used by
32603260
third-party libraries such as buildout to get a suitable script launcher.
32613261

@@ -3321,7 +3321,7 @@ how it parses version numbers.
33213321
* Fix 2 errors with Jython 2.5.
33223322
* Fix 1 failure with Jython 2.5 and 2.7.
33233323
* Disable workaround for Jython scripts on Linux systems.
3324-
* Distribute #336: `setup.py` no longer masks failure exit code when tests fail.
3324+
* Distribute #336: ``setup.py`` no longer masks failure exit code when tests fail.
33253325
* Fix issue in pkg_resources where try/except around a platform-dependent
33263326
import would trigger hook load failures on Mercurial. See pull request 32
33273327
for details.
@@ -3332,7 +3332,7 @@ how it parses version numbers.
33323332

33333333
* Fix test suite with Python 2.6.
33343334
* Fix some DeprecationWarnings and ResourceWarnings.
3335-
* Distribute #335: Backed out `setup_requires` superceding installed requirements
3335+
* Distribute #335: Backed out ``setup_requires`` superceding installed requirements
33363336
until regression can be addressed.
33373337

33383338
0.6.31
@@ -3342,7 +3342,7 @@ how it parses version numbers.
33423342
* Distribute #329: Properly close files created by tests for compatibility with
33433343
Jython.
33443344
* Work around Jython #1980 and Jython #1981.
3345-
* Distribute #334: Provide workaround for packages that reference `sys.__stdout__`
3345+
* Distribute #334: Provide workaround for packages that reference ``sys.__stdout__``
33463346
such as numpy does. This change should address
33473347
`virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long
33483348
as the system encoding is UTF-8 or the IO encoding is specified in the
@@ -3351,7 +3351,7 @@ how it parses version numbers.
33513351
PYTHONIOENCODING=utf8 pip install numpy
33523352

33533353
* Fix for encoding issue when installing from Windows executable on Python 3.
3354-
* Distribute #323: Allow `setup_requires` requirements to supercede installed
3354+
* Distribute #323: Allow ``setup_requires`` requirements to supercede installed
33553355
requirements. Added some new keyword arguments to existing pkg_resources
33563356
methods. Also had to updated how __path__ is handled for namespace packages
33573357
to ensure that when a new egg distribution containing a namespace package is
@@ -3371,16 +3371,16 @@ how it parses version numbers.
33713371
* BB Pull Request #14: Honor file permissions in zip files.
33723372
* Distribute #327: Merged pull request #24 to fix a dependency problem with pip.
33733373
* Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
3374-
* If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
3374+
* If Sphinx is installed, the ``upload_docs`` command now runs ``build_sphinx``
33753375
to produce uploadable documentation.
3376-
* Distribute #326: `upload_docs` provided mangled auth credentials under Python 3.
3376+
* Distribute #326: ``upload_docs`` provided mangled auth credentials under Python 3.
33773377
* Distribute #320: Fix check for "createable" in distribute_setup.py.
33783378
* Distribute #305: Remove a warning that was triggered during normal operations.
33793379
* Distribute #311: Print metadata in UTF-8 independent of platform.
33803380
* Distribute #303: Read manifest file with UTF-8 encoding under Python 3.
33813381
* Distribute #301: Allow to run tests of namespace packages when using 2to3.
33823382
* Distribute #304: Prevent import loop in site.py under Python 3.3.
3383-
* Distribute #283: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.
3383+
* Distribute #283: Reenable scanning of ``*.pyc`` / ``*.pyo`` files on Python 3.3.
33843384
* Distribute #299: The develop command didn't work on Python 3, when using 2to3,
33853385
as the egg link would go to the Python 2 source. Linking to the 2to3'd code
33863386
in build/lib makes it work, although you will have to rebuild the module
@@ -3390,10 +3390,10 @@ how it parses version numbers.
33903390
* Distribute #313: Support for sdist subcommands (Python 2.7)
33913391
* Distribute #314: test_local_index() would fail an OS X.
33923392
* Distribute #310: Non-ascii characters in a namespace __init__.py causes errors.
3393-
* Distribute #218: Improved documentation on behavior of `package_data` and
3394-
`include_package_data`. Files indicated by `package_data` are now included
3393+
* Distribute #218: Improved documentation on behavior of ``package_data`` and
3394+
``include_package_data``. Files indicated by ``package_data`` are now included
33953395
in the manifest.
3396-
* `distribute_setup.py` now allows a `--download-base` argument for retrieving
3396+
* ``distribute_setup.py`` now allows a ``--download-base`` argument for retrieving
33973397
distribute from a specified location.
33983398

33993399
0.6.28
@@ -3402,7 +3402,7 @@ how it parses version numbers.
34023402
* Distribute #294: setup.py can now be invoked from any directory.
34033403
* Scripts are now installed honoring the umask.
34043404
* Added support for .dist-info directories.
3405-
* Distribute #283: Fix and disable scanning of `*.pyc` / `*.pyo` files on
3405+
* Distribute #283: Fix and disable scanning of ``*.pyc`` / ``*.pyo`` files on
34063406
Python 3.3.
34073407

34083408
0.6.27
@@ -3636,7 +3636,7 @@ how it parses version numbers.
36363636
0.6.4
36373637
-----
36383638

3639-
* Added the generation of `distribute_setup_3k.py` during the release.
3639+
* Added the generation of ``distribute_setup_3k.py`` during the release.
36403640
This closes Distribute #52.
36413641

36423642
* Added an upload_docs command to easily upload project documentation to

appveyor.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,14 @@ test_script:
4141
- python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
4242
- pip install --upgrade tox tox-venv virtualenv
4343
- pip freeze --all
44-
- tox
44+
- tox -- --junit-xml=test-results.xml
4545

4646
after_test:
4747
- tox -e coverage,codecov
4848

49+
on_finish:
50+
- ps: |
51+
$wc = New-Object 'System.Net.WebClient'
52+
$wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test-results.xml))
53+
4954
version: '{build}'

changelog.d/2394.doc.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Extended towncrier news template to include change note categories.
2+
This allows to see what types of changes a given version introduces
3+
-- by :user:`webknjaz`

changelog.d/2401.misc.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Enabled test results reporting in AppVeyor CI
2+
-- by :user:`webknjaz`

changelog.d/2420.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Replace Python 3.9.0 beta with 3.9.0 final on GitHub Actions.

changelog.d/2421.misc.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Python 3.9 Trove classifier got added to the dist metadata
2+
-- by :user:`webknjaz`

changelog.d/2427.doc.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Started enforcing strict syntax and reference validation
2+
in the Sphinx docs -- by :user:`webknjaz`

changelog.d/2428.doc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed redundant Sphinx ``Makefile`` support -- by :user:`webknjaz`

docs/Makefile

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)