Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to bootstrap to deploy ez_setup.py to https://bootstrap.pypa.io/ez_setup.py #560

Merged
merged 342 commits into from Apr 26, 2016

Conversation

jimfulton
Copy link
Contributor

I assume ez_setup.py is the only file that matters and that other changes don't matter.

Not sure if there's a better way to do this.

jaraco and others added 30 commits January 16, 2016 17:38
The problem was that restructured text considered 19.4 is a sibtitle to "CHANGES".

--HG--
branch : svetlyak40wt/make-194-same-level-header-as-other-vers-1453106898145
--HG--
branch : svetlyak40wt/make-194-same-level-header-as-other-vers-1453106898145
… force import in delayed-import environments. Fixes #487.
…ader-as-other-vers-1453106898145 (pull request #171)

Make 19.4 same level header as other version numbers.
…as neither of those licenses grant authority for use outside their respective projects. Vendored projects are licensed under their respective licenses, currently MIT for six and Apache v2 for packaging. Fixes #132.
Remove JythonCommandSpec as it's not required on Jython 2.7 and setuptools no longer supports anything 2.5, but had to test for 'Jython on Windows' in two other places
…rted Cython and Cython references the distutils.Extension. Fixes #488.
…pace in which to launch the script. Prevents imports from occuring relative to 'setuptools' on Python 2. Ref #490.
…ibility for PyPy3 where importlib.machinery exists but FileFinder and SourceFileLoader aren't implemented.
jaraco and others added 25 commits April 20, 2016 09:47
…cted order is different on Python 2.6, not because of the lack of OrderedDict, but because of different behavior in RawConfigParser. Ref #553.
The upload command wasn't prompting for a password. If there was no
password specified in ~/.pypirc, the upload command,
    python setup.py sdist upload
would fail and raise a TypeError. The workaround for this was to use
    python setup.py sdist register upload
since the register command does prompt for a password.

This commit ensures that the upload command prompts for a password
if not given one by ~/.pypirc or the register command.
This adds support for the deprecated python_implementation marker
which was an undocumented setuptools marker prior to 20.2 in
addition to the newer markers.
This change also removes:

    sys.meta_path = [importer for importer in sys.meta_path if
                     importer.__class__.__module__ != 'pkg_resources.extern']

from _unload_pkg_resources.

These lines were removed from the version at: https://bootstrap.pypa.io/ez_setup.py

I don't know why the code there and here differs.
Fix setuptools url and curl wants --location to follow redirects
@ghost
Copy link

ghost commented Apr 26, 2016

My internet is terrible and I don't have access even to a web browser. If someone can merge this PR or otherwise fast forward the bootstrap branch to master, that should fix the issue. Otherwise, it will be a few hours before I can invoke the change.

Sent from my comm

On Apr 25, 2016, at 18:21, Jim Fulton <notifications@github.commailto:notifications@github.com> wrote:

I assume ez_setup.py is the only file that matters and that other changes don't matter.

Not sure if there's a better way to do this.


You can view, comment on, or merge this pull request online at:

#560

Commit Summary

  • Get VersionConflict from pkg_resources.
  • Added tag 19.4 for changeset f47f3671508b
  • Bumped to 19.5 in preparation for next release.
  • Make 19.4 same level header as other version numbers.
  • Make all headers on the same level in CHANGES.txt.
  • Invoke import on importlib.machinery directly. Access an attribute to force import in delayed-import environments. Fixes special casing importlib.machinery breaks PyPy #487.
  • Merged in svetlyak40wt/setuptools/svetlyak40wt/make-194-same-level-header-as-other-vers-1453106898145 (pull request setuptools documentation referencing 'Distribute' instead of 'setuptools' #171)
  • Bumped to 19.4.1 in preparation for next release.
  • Added tag 19.4.1 for changeset 0bda3291ac72
  • Extract variable for candidate encodings
  • Add test capturing failure. Ref Unhandled exception in unicode_utils #486.
  • Avoid TypeError when getfilesystemencoding returns None. Fixes Unhandled exception in unicode_utils #486.
  • Relicense the package as MIT license. Drop licensing as PSF and Zope as neither of those licenses grant authority for use outside their respective projects. Vendored projects are licensed under their respective licenses, currently MIT for six and Apache v2 for packaging. Fixes Missing license #132.
  • Update changelog.
  • Merged in darjus/setuptools (pull request easy_install does not handle -f option correctly with paths containing spaces #169)
  • Update changelog
  • Bumped to 19.5 in preparation for next release.
  • Added tag 19.5 for changeset 0a68cbab7258
  • Bumped to 19.6 in preparation for next release.
  • Add 'launch' hook, based on pip.utils.setuptools_build
  • Also hide Cython when hiding setuptools, as setuptools will have imported Cython and Cython references the distutils.Extension. Fixes Extension instance gets multiple manifestations when cython is present #488.
  • Added tag 19.6b1 for changeset 34121bf49b1a
  • Added tag 19.6 for changeset 3c2332e4ec72
  • Bumped to 19.7 in preparation for next release.
  • Rather than re-use globals of setuptools.launch, build a unique namespace in which to launch the script. Prevents imports from occuring relative to 'setuptools' on Python 2. Ref Upgrading 19.4 -> 19.6 breaks pyramid_mako tests #490.
  • Combine redundant imports of future functionality
  • Pull up DefaultProvider registration into a classmethod.
  • Adapt resolution of classes from importlib.machinery. Restores compatibility for PyPy3 where importlib.machinery exists but FileFinder and SourceFileLoader aren't implemented.
  • Test on pypy3
  • Update changelog
  • Merge pull request Tests not run by setup.py test #31 from Ivoz/patch-1
  • Allow failures with pypy3 for now
  • Bumped to 19.6.1 in preparation for next release.
  • Added tag 19.6.1 for changeset 35d9179d0439
  • Bumped to 19.6.2 in preparation for next release.
  • Extract function _rebuild_mod_path
  • Rename inner function and add docstring
  • Normalize all paths, not excluding ''. Fixes setuptools >=19.4 breaks pip install builds for two-level namespace packages #491.
  • Update changelog
  • Added tag 19.6.2 for changeset d2782cbb2f15
  • Bumped to 19.6.3 in preparation for next release.
  • Extract variable for template string
  • Use new style string formatting
  • FreeBSD: Add root certificate from ca_root_nss.
  • Merge pull request TypeError in pkg_resources.resource_stream on Python 3 #32 from silenius/master
  • Update changelog
  • Bumped to 19.7 in preparation for next release.
  • Added tag 19.7 for changeset c6e619ce910d
  • Bumped to 19.8 in preparation for next release.
  • Rewrite setup/teardown methods as pytest fixtures, encapsulating concepts for clarity. Incidentally, this also fixes Test: test_two_levels_deep fails when /tmp is symlink #231.
  • Use py.path objects for cleaner setup
  • Extract variable for readability
  • Use py.path objects for cleaner setup
  • Use consistent numbering for clarity.
  • Extract ns_str as class attribute
  • Remove unused imports
  • Backout changeset 1ae2a75724bbba56373784f185a7f235ed0f24a4
  • Merge backout of 1ae2a75724bb; fixes install_egg_info command causes the --record argument to 'install' to create a wrong entry #118.
  • Bumped to 20.0 in preparation for next release.
  • Fix syntax errors on Python 2
  • Fix failing tests on Python 2
  • Added tag 20.0 for changeset 2a60daeff0cd
  • Bumped to 20.1 in preparation for next release.
  • Switch back to SyntaxError for invalid markers, stops consumers having to import packaging themselves
  • Update to packaging 16.1
  • Correct tests after the move to packaging 16.1.
  • Replace upload docs with a reference to distutils docs, as
  • Override upload command to load passwords from keyring when available and not otherwise specified.
  • Added tag 20.1 for changeset 06c9d3ffae80
  • Bumped to 20.2 in preparation for next release.
  • Remove unused import
  • Upload_docs should also resolve passwords from keyring same as upload command.
  • Bumped to 20.1.1 in preparation for next release.
  • Added tag 20.1.1 for changeset 919a40f18431
  • Bumped to 20.1.2 in preparation for next release.
  • Correct syntax in changelog
  • Merge from master, resolving conflicts.
  • Correct tests under both Python 2 and 3.
  • Use io module and text type in install_site_py
  • Use pytest tmpdir fixture for simplicity and clarity.
  • Remove unused imports
  • Fix typo, correcting failures on late Pythons when mock is not already installed.
  • Update changelog
  • Add hyperlinks to PEPs in changelog.
  • Add timestamps to changelog.
  • Remove explicit PEP links now that the linker handles it.
  • Update changelog
  • Merge pull request series from Steve Kowalik for updated and unified marker implementation. Fixes Unify environment marker support #122.
  • Bumped to 20.2 in preparation for next release.
  • Added tag 20.2 for changeset 74c4ffbe1f39
  • Bumped to 20.3 in preparation for next release.
  • Update changelog to reflect new findings.
  • Add test capturing previously allowed usage. Ref version 20.2 doesn't like non numeric requirements #499.
  • Update to packaging 16.4. Fixes version 20.2 doesn't like non numeric requirements #499.
  • Update changelog
  • Bumped to 20.2.1 in preparation for next release.
  • Added tag 20.2.1 for changeset 1aacb05fbdfe
  • Bumped to 20.2.2 in preparation for next release.
  • Add test capturing expectation that spaces between version specifiers should be allowed. Ref packaging 16.4 does not allow whitepace between requirement version conditions #502.
  • Replace makefile with pavement file, granting portability on OS X and Windows. Fixes Makefile is not portable #505.
  • Re-run vendoring on packaging 16.4 (adding utils.py module, apparently omitted).
  • Bump vendored packaging to 16.5. Fixes packaging 16.4 does not allow whitepace between requirement version conditions #502.
  • Update changelog
  • Ignore pavement.py
  • Added tag 20.2.2 for changeset 48aa5271ef1c
  • Bumped to 20.2.3 in preparation for next release.
  • Shift requirement parsing inside Requirement
  • Change pkg_resources.Requirement to be a subclass of packaging
  • Add in safe_name for project_name, which disappeared in my refactor.
  • Add in a test that checks comparsion of Requirement with markers
  • Update changelog
  • Bumped to 20.3 in preparation for next release.
  • Added tag 20.3 for changeset 9c55a3a1268a
  • Bumped to 20.4 in preparation for next release.
  • Remove the import hook when unloading the old pkg_resources modules
  • Remove CVS and Subversion references in include_package_data docs
  • Safer way to remove the import hook
  • Update documentation for Requirement.
  • Merged in agronholm/setuptools/agronholm/remove-the-import-hook-when-unloading-th-1458177009332 (pull request Unzipped egg support - setuptools fails to install from a local folder it itself prepared #182)
  • Update changelog
  • Merged in stevenk_/setuptools (pull request setuptools installs into nested directories with a second build, and then installs the build directory #184)
  • Update changelog
  • Bumped to 20.3.1 in preparation for next release.
  • Added tag 20.3.1 for changeset 3e87e975a95c
  • Bumped to 20.3.2 in preparation for next release.
  • Point towards SCM plugins for including source files
  • Merged in koterpillar/setuptools (pull request AttributeError: test command fails with NoneType object has no attribute 'run' #183)
  • Rename variables for clarity and easier troubleshooting (avoid masking intermediate 'parts' value).
  • Support environment markers in *_requires, via WorkingSet.
  • Extract decision point into a variable
  • Update vendored packaging to 16.6
  • Update most bitbucket references to point to Github now. Fixes Migrate to Github #422.
  • Bumped to 20.4 in preparation for next release.
  • Added tag 20.4 for changeset 06692c64fb9b
  • Bumped to 20.5 in preparation for next release.
  • Use jaraco.packaging 2.11 for better support for bookmarks and thus Git push targets.
  • Merge https://bitbucket.org/pypa/setuptools/pull-requests/185.
  • Just render the date and not the time of tagged releases in the changelog.
  • Added tag 20.5 for changeset f8174392e9e9
  • Bumped to 20.6 in preparation for next release.
  • Attempting a new streamlined, Travis-powered release process.
  • Follow semver to the letter for simplicity.
  • Added tag v20.6.0 for changeset 114f3dbc8a73
  • Bump version: 20.5.0 → 20.6.0
  • Add fallback version to enable egg_info bootstrap
  • Bump version: 20.6.0 → 20.6.1
  • Added tag v20.6.1 for changeset a3d4006688fe
  • Try setting Python version and all_branches: true per PyPI deployment fails on tags travis-ci/dpl#166
  • Bump version: 20.6.1 → 20.6.2
  • Added tag v20.6.2 for changeset 283150971260
  • Took a chance on 'env:' and lost
  • Bump version: 20.6.2 → 20.6.3
  • Added tag v20.6.3 for changeset 8b46dc41cb23
  • Ignore doc building during release; rely on separate dpl step.
  • Bump version: 20.6.3 → 20.6.4
  • Added tag v20.6.4 for changeset 7258be20fe93
  • Logic in upload_docs will only trigger docs build if no docs dir was specified, so explicitly build during release. Fixes Docs uploads failing in Travis deploys #524.
  • Added tag v20.6.5 for changeset 7e0ab283db4e
  • Bump version: 20.6.4 → 20.6.5
  • Don't test the bootstrap script. It fails when deploys are happening, which is common when releases are being made.
  • Recognize semver versions with v prefix in rst.linker config
  • Merge pull request Update vendored packaging to 16.6 #522 from s-t-e-v-e-n-k/update-packaging
  • Update changelog
  • Update tags for rebase to 'distribute' branch (Mercurial)
  • Merge distribute tag updates
  • Fix error in docs build
  • Added tag v20.6.6 for changeset 57d63b38e855
  • Bump version: 20.6.5 → 20.6.6
  • Ensure sphinx is present for building docs
  • Added tag v20.6.6 for changeset b04dbdd161d7
  • Remove unused imports
  • Bypass environment marker evaluation in requirements resolution. Ref 20.5.0+ breaks existing setup.py files - UndefinedEnvironmentName #523.
  • Extract separate test for test_environment_markers in test_resources. Remove unused variable.
  • Added tag v20.6.7 for changeset 0804d30b6ead
  • Bump version: 20.6.6 → 20.6.7
  • Drop unused safe_repr function
  • Merge pull request Drop unused safe_repr function #528 from s-t-e-v-e-n-k/drop-safe-repr
  • Rename CHANGES and README files for nicer rendering on Github.
  • Merge
  • Restore evaluating environment markers in WorkingSet
  • Merge pull request Restore evaluating environment markers in WorkingSet #530 from s-t-e-v-e-n-k/fix-extra-markers-requires
  • Update changelog
  • Added tag v20.6.8 for changeset a00910db03ec
  • Extract method for testing marker evaluation
  • Remove fallback value until there's something that explains or requires it.
  • Reinstate the or guard in WorkingSet._markers_pass
  • Stop comparing repr()'s in TestEntryPoint
  • This helps finding packages with bad utf
  • Merge pull request Reinstate the or guard in WorkingSet._markers_pass #532 from s-t-e-v-e-n-k/readd-exception-for-marker-eval
  • Extract _ReqExtras to encapsulate that functionality and decouple it from WorkingSet.
  • Adjust expectation that 'extra' is not in the marker evaluation if no extras demanded the requirement.
  • Rely on short-circuit in 'or' rather than building a separate iterable.
  • Merge pull request Stop comparing repr()'s in TestEntryPoint #533 from s-t-e-v-e-n-k/compare-ep-attributes
  • Trap additional exceptions. Fixes Update msvc9_support.py #536.
  • Update changelog
  • Merge pull request This helps finding packages with bad utf #537 from ri0t/patch-1
  • Instead of reasing a new exception, just augment the existing exception, avoiding any concerns about exception type, but still communicating the context necessary to trace the issue. Ref This helps finding packages with bad utf #537.
  • Bump version: 20.6.7 → 20.7.0
  • Added tag v20.7.0 for changeset 0262ab29fc24
  • Swap out hard tabs for spaces
  • Merge pull request Swap out hard tabs for spaces #541 from alex/patch-1
  • Update rationale for the zip_safe flag
  • Merge pull request Update rationale for the zip_safe flag #542 from ncoghlan/patch-1
  • Update changelog. Fixes ValueError: A 0.7-series setuptools cannot be installed with distribute [But we're on 20.7 now] #543.
  • Bump version: 20.7.0 → 20.8.0
  • Added tag v20.8.0 for changeset 7f56b6f40de3
  • Always inject extra into the environment when evaluating markers. Fixes With the version 20.7.0 he call extra in the environment #544.
  • Bump version: 20.8.0 → 20.8.1
  • Added tag v20.8.1 for changeset 8cf9340669ae
  • Handle not-zip-safe egg (folder) deletion in rotate command
  • remove _markerlib from manifest
  • bump certifi to 2016.2.28
  • Merge pull request remove _markerlib from manifest #547 from mindw/rm_markerlib_manifest
  • Merge pull request Handle not-zip-safe egg (folder) deletion in rotate command #545 from totoroliu/master
  • Merge pull request bump certifi to 2016.2.28 #548 from mindw/bump_certifi_version
  • update changelog
  • Bump version: 20.8.1 → 20.9.0
  • Added tag v20.9.0 for changeset 8bf8aaa139bb
  • Limit deploys to Python 3.5 and only the standard run. Ref Standard Dist for setuptools 20.9.0 #549.
  • Preserve order of egg_info section in setup.cfg
  • Use OrderedDict to retain deterministic ordering of version info in egg_info command. Remove lexicographic ordering in setopt.edit_config. Ref Preserve order of egg_info section in setup.cfg #553
  • Remove unused import
  • Dedent
  • Remove superfluous slice
  • Extract method for validating the order.
  • Move Python 2.6 exception into specific test, capturing that the expected order is different on Python 2.6, not because of the lack of OrderedDict, but because of different behavior in RawConfigParser. Ref Preserve order of egg_info section in setup.cfg #553.
  • It's not necessary to build a file with an empty egg_info.
  • Add docstrings explaining the intention of the test. Ref Preserve order of egg_info section in setup.cfg #553.
  • Update changelog. Closes Preserve order of egg_info section in setup.cfg #553.
  • Correction for expected dict order when PYTHONHASHSEED=0
  • Support pypy3 also
  • Prompt for password on upload.
  • Update packaging to 16.7
  • Merge pull request Update packaging to 16.7 #556 from gsnedders/packaging_167
  • Update changelog
  • Merge pull request password prompt on upload command #555 from brookskindle/dev_prompt_password
  • Update changelog
  • Move import to header
  • Add carriage return for symmetry
  • Simplify logic by eliminating retries in password prompt and returning results directly.
  • Added tag v20.10.0 for changeset 98779f519092
  • Bump version: 20.9.0 → 20.10.0
  • Added tag v20.10.0 for changeset c72faa468919
  • Merge
  • Try comparing eq
  • Bump version: 20.10.0 → 20.10.1
  • Added tag v20.10.1 for changeset 3b5fdd077c7d
  • Fix setuptools url and curl wants --location to follow redirects
  • restore previous fix that was never deployed.
  • Merge pull request Fix setuptools url and curl wants --location to follow redirects #559 from buildout/master

File Changes

Patch Links:


You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHubhttps://github.com//pull/560

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet