diff options
| -rw-r--r-- | docs/index.rst | 11 | ||||
| -rw-r--r-- | docs/story.rst | 25 | ||||
| -rw-r--r-- | setup.py | 4 | ||||
| -rw-r--r-- | wheel/install.py | 6 | ||||
| -rwxr-xr-x | wheeldemo.sh | 4 |
5 files changed, 16 insertions, 34 deletions
diff --git a/docs/index.rst b/docs/index.rst index 23c0481..b00e5b6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -16,10 +16,9 @@ packages will be properly installed with only the “Unpack” step preserves enough information to “Spread” (copy data and scripts to their final locations) at any later time. -The wheel project provides a `bdist_wheel` command -for setuptools (requiring a patched distribute from -https://bitbucket.org/dholth/distribute). Wheel files can be installed -with a patched `pip` from https://github.com/dholth/pip. +The wheel project provides a `bdist_wheel` command for setuptools +(requires distribute >= 0.6.28). Wheel files can be installed with a +patched `pip` from https://github.com/dholth/pip. Why not egg? ------------ @@ -60,8 +59,8 @@ wheeldemo.sh:: virtualenv --distribute /tmp/wheeldemo cd /tmp/wheeldemo - # Install wheel and patched pip, distribute - bin/pip install --upgrade --ignore-installed --no-index hg+https://bitbucket.org/dholth/distribute#egg=distribute \ + # Install wheel and patched pip + bin/pip install --upgrade --ignore-installed \ git+https://github.com/dholth/pip.git#egg=pip bin/pip install hg+https://bitbucket.org/dholth/wheel#egg=wheel diff --git a/docs/story.rst b/docs/story.rst index d1a0a96..2c150c2 100644 --- a/docs/story.rst +++ b/docs/story.rst @@ -49,29 +49,14 @@ archive.whl” somewhere on sys.path. If you’ve made it this far you probably wonder whether I’ve heard of eggs. Some comparisons: -* Wheel is an installation format; egg is importable. Wheel archives do -not need to include .pyc and are less tied to a specific Python version -or implementation. Wheel can install (pure Python) packages built with -previous versions of Python so you don’t always have to wait for the -packager to catch up. +* Wheel is an installation format; egg is importable. Wheel archives do not need to include .pyc and are less tied to a specific Python version or implementation. Wheel can install (pure Python) packages built with previous versions of Python so you don’t always have to wait for the packager to catch up. -* Wheel uses .dist-info directories; egg uses .egg-info. Wheel is -compatible with the new world of Python `packaging` and the new concepts -it brings. +* Wheel uses .dist-info directories; egg uses .egg-info. Wheel is compatible with the new world of Python `packaging` and the new concepts it brings. -* Wheel has a richer file naming convention for today’s -multi-implementation world. A single wheel archive can indicate -its compatibility with a number of Python language versions and -implementations, ABIs, and system architectures. Historically the ABI has -been specific to a CPython release, but when we get a longer-term ABI, -wheel will be ready. +* Wheel has a richer file naming convention for today’s multi-implementation world. A single wheel archive can indicate its compatibility with a number of Python language versions and implementations, ABIs, and system architectures. Historically the ABI has been specific to a CPython release, but when we get a longer-term ABI, wheel will be ready. -* Wheel is lossless. The first wheel implementation `bdist_wheel` always -generates `egg-info`, and then converts it to a `.whl`. Later tools will -allow for the conversion of existing eggs and bdist_wininst distributions. +* Wheel is lossless. The first wheel implementation `bdist_wheel` always generates `egg-info`, and then converts it to a `.whl`. Later tools will allow for the conversion of existing eggs and bdist_wininst distributions. -* Wheel is versioned. Every wheel file contains the version of the wheel -specification and the implementation that packaged it. Hopefully the -next migration can simply be to Wheel 2.0. +* Wheel is versioned. Every wheel file contains the version of the wheel specification and the implementation that packaged it. Hopefully the next migration can simply be to Wheel 2.0. I hope you will benefit from wheel. @@ -7,7 +7,7 @@ README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() setup(name='wheel', - version='0.5', + version='0.6', description='A built-package format for Python.', long_description=README + '\n\n' + CHANGES, classifiers=[ @@ -27,7 +27,7 @@ setup(name='wheel', keywords='wheel packaging', license='MIT', packages=['wheel'], - install_requires=['distribute', 'verlib', 'markerlib'], + install_requires=['distribute>=0.6.28', 'markerlib'], include_package_data=True, zip_safe=False, test_suite = 'nose.collector', diff --git a/wheel/install.py b/wheel/install.py index c347452..baf5529 100644 --- a/wheel/install.py +++ b/wheel/install.py @@ -11,13 +11,11 @@ import hmac import hashlib from email.parser import Parser -from verlib import NormalizedVersion - from .decorator import reify from .util import urlsafe_b64encode, utf8, to_json # The next major version after this version of the 'wheel' tool: -VERSION_TOO_HIGH = NormalizedVersion("1.0") +VERSION_TOO_HIGH = (1, 0) # Non-greedy matching of an optional build number may be too clever (more # invalid wheel filenames will match). Separate regex for .dist-info? @@ -83,7 +81,7 @@ class WheelFile(object): def check_version(self): version = self.parsed_wheel_info['Wheel-Version'] - assert NormalizedVersion(version) < VERSION_TOO_HIGH, "Wheel version is too high" + assert tuple(map(int, version.split('.'))) < VERSION_TOO_HIGH, "Wheel version is too high" def sign(self, key, alg="HS256"): """Sign the wheel file's RECORD using `key` and algorithm `alg`. Alg diff --git a/wheeldemo.sh b/wheeldemo.sh index 2e85ddb..28158c0 100755 --- a/wheeldemo.sh +++ b/wheeldemo.sh @@ -7,8 +7,8 @@ set -e virtualenv --distribute /tmp/wheeldemo cd /tmp/wheeldemo -# Install wheel and patched pip, distribute -bin/pip install --upgrade --ignore-installed --no-index hg+https://bitbucket.org/dholth/distribute#egg=distribute \ +# Install wheel and patched pip +bin/pip install --upgrade --ignore-installed \ git+https://github.com/dholth/pip.git#egg=pip bin/pip install hg+https://bitbucket.org/dholth/wheel#egg=wheel |