diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-03-29 12:17:06 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-03-29 12:17:06 -0400 |
commit | 3b90be7bb6323eb44d0f28864509c1d47aa098de (patch) | |
tree | 1c86ff2c6f2fe692de8b7e4a7807a5871692daca | |
parent | 0f147d3f3cffda76b6be0fa3e5b396ede7f3bbf2 (diff) | |
download | external_python_setuptools-3b90be7bb6323eb44d0f28864509c1d47aa098de.tar.gz external_python_setuptools-3b90be7bb6323eb44d0f28864509c1d47aa098de.tar.bz2 external_python_setuptools-3b90be7bb6323eb44d0f28864509c1d47aa098de.zip |
Update most bitbucket references to point to Github now. Fixes #422.
-rw-r--r-- | CHANGES.txt | 79 | ||||
-rwxr-xr-x | README.txt | 4 | ||||
-rw-r--r-- | docs/conf.py | 6 | ||||
-rw-r--r-- | docs/developer-guide.txt | 29 | ||||
-rw-r--r-- | docs/setuptools.txt | 2 | ||||
-rw-r--r-- | pkg_resources/tests/test_resources.py | 2 | ||||
-rw-r--r-- | release.py | 2 | ||||
-rwxr-xr-x | setup.py | 2 | ||||
-rwxr-xr-x | setuptools/command/easy_install.py | 4 | ||||
-rw-r--r-- | setuptools/command/install.py | 2 | ||||
-rw-r--r-- | setuptools/dist.py | 4 |
11 files changed, 74 insertions, 62 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c01c6e77..f44a3984 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,22 +2,35 @@ CHANGES ======= +20.4 +---- + +* Issue #422: Moved hosting to `Github + <https://github.com/pypa/setuptools>`_ + from `Bitbucket <https://bitbucket.org/pypa/setuptools>`_. + Issues have been migrated, though all issues and comments + are attributed to bb-migration. So if you have a particular + issue or issues to which you've been subscribed, you will + want to "watch" the equivalent issue in Github. + The Bitbucket project will be retained for the indefinite + future, but Github now hosts the canonical project repository. + 20.3.1 ------ * Issue #519: Remove import hook when reloading the ``pkg_resources`` module. -* Pull Request #184: Update documentation in ``pkg_resources`` +* BB Pull Request #184: Update documentation in ``pkg_resources`` around new ``Requirement`` implementation. 20.3 ---- -* Pull Request #179: ``pkg_resources.Requirement`` objects are +* BB Pull Request #179: ``pkg_resources.Requirement`` objects are now a subclass of ``packaging.requirements.Requirement``, allowing any environment markers and url (if any) to be affiliated with the requirement -* Pull Request #179: Restore use of RequirementParseError +* BB Pull Request #179: Restore use of RequirementParseError exception unintentionally dropped in 20.2. 20.2.2 @@ -36,11 +49,11 @@ CHANGES ---- * Changelog now includes release dates and links to PEPs. -* Pull Request #173: Replace dual PEP 345 _markerlib implementation +* BB Pull Request #173: Replace dual PEP 345 _markerlib implementation and PEP 426 implementation of environment marker support from packaging 16.1 and PEP 508. Fixes Issue #122. - See also Pull Request #175, Pull Request #168, and - Pull Request #164. Additionally: + See also BB Pull Request #175, BB Pull Request #168, and + BB Pull Request #164. Additionally: - ``Requirement.parse`` no longer retains the order of extras. - ``parse_requirements`` now requires that all versions be PEP-440 compliant, as revealed in #499. Packages released @@ -115,7 +128,7 @@ CHANGES * Issue #486: Correct TypeError when getfilesystemencoding returns None. * Issue #139: Clarified the license as MIT. -* Pull Request #169: Removed special handling of command +* BB Pull Request #169: Removed special handling of command spec in scripts for Jython. 19.4.1 @@ -131,7 +144,7 @@ CHANGES * Issue #341: Correct error in path handling of package data files in ``build_py`` command when package is empty. * Distribute #323, Issue #141, Issue #207, and - Pull Request #167: Another implementation of + BB Pull Request #167: Another implementation of ``pkg_resources.WorkingSet`` and ``pkg_resources.Distribution`` that supports replacing an extant package with a new one, allowing for setup_requires dependencies to supersede installed @@ -147,8 +160,8 @@ CHANGES 19.2 ---- -* Pull Request #163: Add get_command_list method to Distribution. -* Pull Request #162: Add missing whitespace to multiline string +* BB Pull Request #163: Add get_command_list method to Distribution. +* BB Pull Request #162: Add missing whitespace to multiline string literals. 19.1.1 @@ -204,15 +217,15 @@ CHANGES ---- * Update dependency on certify. -* Pull Request #160: Improve detection of gui script in +* BB Pull Request #160: Improve detection of gui script in ``easy_install._adjust_header``. * Made ``test.test_args`` a non-data property; alternate fix - for the issue reported in Pull Request #155. + for the issue reported in BB Pull Request #155. * Issue #453: In ``ez_setup`` bootstrap module, unload all ``pkg_resources`` modules following download. -* Pull Request #158: Honor PEP-488 when excluding +* BB Pull Request #158: Honor PEP-488 when excluding files for namespace packages. -* Issue #419 and Pull Request #144: Add experimental support for +* Issue #419 and BB Pull Request #144: Add experimental support for reading the version info from distutils-installed metadata rather than using the version in the filename. @@ -314,7 +327,7 @@ CHANGES However, for systems with this build of setuptools, Cython will be downloaded on demand. * Issue #396: Fixed test failure on OS X. -* Pull Request #136: Remove excessive quoting from shebang headers +* BB Pull Request #136: Remove excessive quoting from shebang headers for Jython. 17.1.1 @@ -341,11 +354,11 @@ CHANGES 16.0 ---- -* Pull Request #130: Better error messages for errors in +* BB Pull Request #130: Better error messages for errors in parsed requirements. -* Pull Request #133: Removed ``setuptools.tests`` from the +* BB Pull Request #133: Removed ``setuptools.tests`` from the installed packages. -* Pull Request #129: Address deprecation warning due to usage +* BB Pull Request #129: Address deprecation warning due to usage of imp module. 15.2 @@ -364,7 +377,7 @@ CHANGES 15.0 ---- -* Pull Request #126: DistributionNotFound message now lists the package or +* BB Pull Request #126: DistributionNotFound message now lists the package or packages that required it. E.g.:: pkg_resources.DistributionNotFound: The 'colorama>=0.3.1' distribution was not found and is required by smlib.log. @@ -405,7 +418,7 @@ CHANGES 14.1 ---- -* Pull Request #125: Add ``__ne__`` to Requirement class. +* BB Pull Request #125: Add ``__ne__`` to Requirement class. * Various refactoring of easy_install. 14.0 @@ -413,7 +426,7 @@ CHANGES * Bootstrap script now accepts ``--to-dir`` to customize save directory or allow for re-use of existing repository of setuptools versions. See - Pull Request #112 for background. + BB Pull Request #112 for background. * Issue #285: ``easy_install`` no longer will default to installing packages to the "user site packages" directory if it is itself installed there. Instead, the user must pass ``--user`` in all cases to install @@ -438,7 +451,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. 13.0 ---- -* Issue #356: Back out Pull Request #119 as it requires Setuptools 10 or later +* Issue #356: Back out BB Pull Request #119 as it requires Setuptools 10 or later as the source during an upgrade. * Removed build_py class from setup.py. According to 892f439d216e, this functionality was added to support upgrades from old Distribute versions, @@ -447,7 +460,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. 12.4 ---- -* Pull Request #119: Restore writing of ``setup_requires`` to metadata +* BB Pull Request #119: Restore writing of ``setup_requires`` to metadata (previously added in 8.4 and removed in 9.0). 12.3 @@ -472,7 +485,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. 12.1 ---- -* Pull Request #118: Soften warning for non-normalized versions in +* BB Pull Request #118: Soften warning for non-normalized versions in Distribution. 12.0.5 @@ -613,7 +626,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. 8.4 --- -* Pull Request #106: Now write ``setup_requires`` metadata. +* BB Pull Request #106: Now write ``setup_requires`` metadata. 8.3 --- @@ -630,7 +643,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. 8.2 --- -* Pull Request #85: Search egg-base when adding egg-info to manifest. +* BB Pull Request #85: Search egg-base when adding egg-info to manifest. 8.1 --- @@ -733,9 +746,9 @@ process to fail and PyPI uploads no longer accept files for 13.0. Any users producing distributions with filenames that match those above case-insensitively, but not case-sensitively, should rename those files in their repository for better portability. -* Pull Request #72: When using ``single_version_externally_managed``, the +* BB Pull Request #72: When using ``single_version_externally_managed``, the exclusion list now includes Python 3.2 ``__pycache__`` entries. -* Pull Request #76 and Pull Request #78: lines in top_level.txt are now +* BB Pull Request #76 and BB Pull Request #78: lines in top_level.txt are now ordered deterministically. * Issue #118: The egg-info directory is now no longer included in the list of outputs. @@ -934,7 +947,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. 3.2 --- -* Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files. +* BB Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files. * Issue #162: Update dependency on certifi to 1.0.1. * Issue #164: Update dependency on wincertstore to 0.2. @@ -977,7 +990,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. security vulnerabilities presented by use of tar archives in ez_setup.py. It also leverages the security features added to ZipFile.extract in Python 2.7.4. * Issue #65: Removed deprecated Features functionality. -* Pull Request #28: Remove backport of ``_bytecode_filenames`` which is +* BB Pull Request #28: Remove backport of ``_bytecode_filenames`` which is available in Python 2.6 and later, but also has better compatibility with Python 3 environments. * Issue #156: Fix spelling of __PYVENV_LAUNCHER__ variable. @@ -1073,7 +1086,7 @@ process to fail and PyPI uploads no longer accept files for 13.0. * Issue #27: ``easy_install`` will now use credentials from .pypirc if present for connecting to the package index. -* Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth`` +* BB Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth`` when the username/password pair length indicates wrapping. 1.3.2 @@ -1415,7 +1428,7 @@ Added several features that were slated for setuptools 0.6c12: 0.6.36 ------ -* Pull Request #35: In Buildout #64, it was reported that +* BB Pull Request #35: In Buildout #64, it was reported that under Python 3, installation of distutils scripts could attempt to copy the ``__pycache__`` directory as a file, causing an error, apparently only under Windows. Easy_install now skips all directories when processing @@ -1490,7 +1503,7 @@ how it parses version numbers. 0.6.29 ------ -* Pull Request #14: Honor file permissions in zip files. +* BB Pull Request #14: Honor file permissions in zip files. * Distribute #327: Merged pull request #24 to fix a dependency problem with pip. * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301. * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx` @@ -18,7 +18,7 @@ basic routine, so below are some examples to get you started. Setuptools requires Python 2.6 or later. To install setuptools on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x -<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_. +<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_. The link provided to ez_setup.py is a bookmark to bootstrap script for the latest known stable release. @@ -176,7 +176,7 @@ them there, so this reference list can be updated. If you have working, *tested* patches to correct problems or add features, you may submit them to the `setuptools bug tracker`_. -.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues +.. _setuptools bug tracker: https://github.com/pypa/setuptools/issues .. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html .. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html .. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html diff --git a/docs/conf.py b/docs/conf.py index 1a4da380..6570f661 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -208,11 +208,11 @@ link_files = { replace=[ dict( pattern=r"(Issue )?#(?P<issue>\d+)", - url='{BB}/pypa/setuptools/issue/{issue}', + url='{GH}/pypa/setuptools/issues/{issue}', ), dict( - pattern=r"Pull Request ?#(?P<pull_request>\d+)", - url='{BB}/pypa/setuptools/pull-request/{pull_request}', + pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)", + url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}', ), dict( pattern=r"Distribute #(?P<distribute>\d+)", diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt index ae33649b..688300dc 100644 --- a/docs/developer-guide.txt +++ b/docs/developer-guide.txt @@ -23,10 +23,10 @@ quality of contribution. Project Management ------------------ -Setuptools is maintained primarily in Bitbucket at `this home -<https://bitbucket.org/pypa/setuptools>`_. Setuptools is maintained under the +Setuptools is maintained primarily in Github at `this home +<https://github.com/pypa/setuptools>`_. Setuptools is maintained under the Python Packaging Authority (PyPA) with several core contributors. All bugs -for Setuptools are filed and the canonical source is maintained in Bitbucket. +for Setuptools are filed and the canonical source is maintained in Github. User support and discussions are done through the issue tracker (for specific) issues, through the distutils-sig mailing list, or on IRC (Freenode) at @@ -44,7 +44,7 @@ describing the motivation behind making changes. First search to see if a ticket already exists for your issue. If not, create one. Try to think from the perspective of the reader. Explain what behavior you expected, what you got instead, and what factors might have contributed to the unexpected -behavior. In Bitbucket, surround a block of code or traceback with the triple +behavior. In Github, surround a block of code or traceback with the triple backtick "\`\`\`" so that it is formatted nicely. Filing a ticket provides a forum for justification, discussion, and @@ -61,17 +61,17 @@ jump to the in-depth discussion about any subject referenced. Source Code ----------- -Grab the code at Bitbucket:: +Grab the code at Github:: - $ hg clone https://bitbucket.org/pypa/setuptools + $ git checkout https://github.com/pypa/setuptools If you want to contribute changes, we recommend you fork the repository on -Bitbucket, commit the changes to your repository, and then make a pull request -on Bitbucket. If you make some changes, don't forget to: +Github, commit the changes to your repository, and then make a pull request +on Github. If you make some changes, don't forget to: - add a note in CHANGES.txt -Please commit all changes in the 'default' branch against the latest available +Please commit all changes in the 'master' branch against the latest available commit or for bug-fixes, against an earlier commit or release in which the bug occurred. @@ -79,12 +79,11 @@ If you find yourself working on more than one issue at a time, Setuptools generally prefers Git-style branches, so use Mercurial bookmarks or Git branches or multiple forks to maintain separate efforts. -Setuptools also maintains an unofficial `Git mirror in Github -<https://github.com/jaraco/setuptools>`_. Contributors are welcome to submit -pull requests here, but because they are not integrated with the Bitbucket -Issue tracker, linking pull requests to tickets is more difficult. The -Continuous Integration tests that validate every release are run from this -mirror. +The Continuous Integration tests that validate every release are run +from this repository. + +For posterity, the old `Bitbucket mirror +<https://bitbucket.org/pypa/setuptools>`_ is available. ------- Testing diff --git a/docs/setuptools.txt b/docs/setuptools.txt index 886216ea..eeeab937 100644 --- a/docs/setuptools.txt +++ b/docs/setuptools.txt @@ -2658,5 +2658,5 @@ confirmed via the list are actual bugs, and which you have reduced to a minimal set of steps to reproduce. .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/ -.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/ +.. _setuptools bug tracker: https://github.com/pypa/setuptools/ diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index 1444b9ba..f59d55d5 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -717,7 +717,7 @@ class TestNamespaces: sys.path is imported, and that the namespace package's __path__ is in the correct order. - Regression test for https://bitbucket.org/pypa/setuptools/issues/207 + Regression test for https://github.com/pypa/setuptools/issues/207 """ tmpdir = symlinked_tmpdir @@ -15,6 +15,6 @@ files_with_versions = 'setuptools/version.py', # bdist_wheel must be included or pip will break dist_commands = 'sdist', 'bdist_wheel' -test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools" +test_info = "Travis-CI tests: http://travis-ci.org/#!/pypa/setuptools" os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1" @@ -78,7 +78,7 @@ setup_params = dict( author_email="distutils-sig@python.org", long_description=long_description, keywords="CPAN PyPI distutils eggs package management", - url="https://bitbucket.org/pypa/setuptools", + url="https://github.com/pypa/setuptools", src_root=src_root, packages=setuptools.find_packages(exclude=['*.tests']), package_data=package_data, diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 0733065e..ea5cb028 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -780,7 +780,7 @@ class easy_install(Command): There are a couple of template scripts in the package. This function loads one of them and prepares it for use. """ - # See https://bitbucket.org/pypa/setuptools/issue/134 for info + # See https://github.com/pypa/setuptools/issues/134 for info # on script file naming and downstream issues with SVR4 name = 'script.tmpl' if dev_path: @@ -1762,7 +1762,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None): # * Does not support the dict.pop() method, forcing us to use the # get/del patterns instead. For more detailed information see the # following links: - # https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960 + # https://github.com/pypa/setuptools/issues/202#issuecomment-202913420 # https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99 old_entry = cache[p] del cache[p] diff --git a/setuptools/command/install.py b/setuptools/command/install.py index d2bca2ec..31a5ddb5 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py @@ -8,7 +8,7 @@ import distutils.command.install as orig import setuptools # Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for -# now. See https://bitbucket.org/pypa/setuptools/issue/199/ +# now. See https://github.com/pypa/setuptools/issues/199/ _install = orig.install diff --git a/setuptools/dist.py b/setuptools/dist.py index 77855415..086e0a58 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -720,7 +720,7 @@ class Feature: """ **deprecated** -- The `Feature` facility was never completely implemented or supported, `has reported issues - <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in + <https://github.com/pypa/setuptools/issues/58>`_ and will be removed in a future version. A subset of the distribution that can be excluded if unneeded/wanted @@ -777,7 +777,7 @@ class Feature: def warn_deprecated(): warnings.warn( "Features are deprecated and will be removed in a future " - "version. See http://bitbucket.org/pypa/setuptools/65.", + "version. See https://github.com/pypa/setuptools/issues/65.", DeprecationWarning, stacklevel=3, ) |