Daniel Holth avatar Daniel Holth committed fbd2bca

version 0.6

Comments (0)

Files changed (5)

 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?
 ------------
         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
 
 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.
 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=[
       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',
 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?
         
     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 
 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
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.