diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2014-03-26 22:29:21 -0400 |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2014-03-26 22:29:21 -0400 |
| commit | 2a4395abc9a23650ec65929e7fd22417efc244c4 (patch) | |
| tree | 54ccbbbb09ab3c3faacc1ebdc7f2505b44d434d3 | |
| parent | a60be9a451ac741f7524c27d0db3532d5c97ade0 (diff) | |
| parent | aeabff83803cc25af0ec9e41a15e633457bcfa1a (diff) | |
| download | wheel-2a4395abc9a23650ec65929e7fd22417efc244c4.tar.gz | |
Merged in bkabrda/wheel-4/bkabrda/fix-tests-broken-by-fix-for-85-e59e807-1385642236520 (pull request #35)
Fix tests broken by fix for #85 (e59e807).
| -rw-r--r-- | MANIFEST.in | 3 | ||||
| -rw-r--r-- | README.txt | 2 | ||||
| -rw-r--r-- | docs/index.rst | 5 | ||||
| -rw-r--r-- | wheel/bdist_wheel.py | 24 |
4 files changed, 25 insertions, 9 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 2c04cd6..990e55d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,7 @@ include wheel/*.txt *.txt *.sh recursive-include wheel/test *.py +include wheel/test/test-1.0-py2.py3-none-win32.whl +include wheel/test/headers.dist/header.h +include wheel/test/pydist-schema.json prune wheel/test/*/dist prune wheel/test/*/build @@ -19,7 +19,7 @@ line utility. The wheel documentation is at http://wheel.rtfd.org/. The file format is documented in PEP 427 (http://www.python.org/dev/peps/pep-0427/). -The reference implementation is at http://bitbucket.org/dholth/wheel/ +The reference implementation is at https://bitbucket.org/pypa/wheel Why not egg? ------------ diff --git a/docs/index.rst b/docs/index.rst index 6b4b188..595469b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -26,6 +26,10 @@ built packages:: # Install from cached wheels pip install --use-wheel --no-index --find-links=/tmp/wheelhouse pyramid + + # Install from cached wheels remotely + pip install --use-wheel --no-index --find-links=https://wheelhouse.example.com/ pyramid + For lxml, an up to 3-minute "search for the newest version and compile" can become a less-than-1 second "unpack from wheel". @@ -132,6 +136,7 @@ Wheel * Because ‘newegg’ was taken. * Python packaging - reinvented. * A container for cheese. +* It makes it easier to roll out software. .. toctree:: :maxdepth: 2 diff --git a/wheel/bdist_wheel.py b/wheel/bdist_wheel.py index 77d1752..c63f291 100644 --- a/wheel/bdist_wheel.py +++ b/wheel/bdist_wheel.py @@ -74,9 +74,12 @@ class bdist_wheel(Command): ('skip-scripts', None, "skip building the setuptools console_scripts", "(default: false)"), + ('universal', None, + "make a universal wheel" + " (default: false)"), ] - boolean_options = ['keep-temp', 'skip-build', 'relative'] + boolean_options = ['keep-temp', 'skip-build', 'relative', 'universal'] def initialize_options(self): self.bdist_dir = None @@ -93,6 +96,7 @@ class bdist_wheel(Command): self.owner = None self.group = None self.skip_scripts = False + self.universal = False def finalize_options(self): if self.bdist_dir is None: @@ -108,6 +112,14 @@ class bdist_wheel(Command): self.root_is_purelib = self.distribution.is_pure() + # Support legacy [wheel] section for setting universal + wheel = self.distribution.get_option_dict('wheel') + if 'universal' in wheel: + # please don't define this in your global configs + val = wheel['universal'][1].strip() + if val.lower() in ('1', 'true', 'yes'): + self.universal = True + @property def wheel_dist_name(self): """Return distribution full name with - replaced with _""" @@ -123,13 +135,9 @@ class bdist_wheel(Command): plat_name = 'any' impl_name = 'py' if purity: - wheel = self.distribution.get_option_dict('wheel') - if 'universal' in wheel: - # please don't define this in your global configs - val = wheel['universal'][1].strip() - if val.lower() in ('1', 'true', 'yes'): - impl_name = 'py2.py3' - impl_ver = '' + if self.universal: + impl_name = 'py2.py3' + impl_ver = '' tag = (impl_name + impl_ver, abi_tag, plat_name) else: plat_name = self.plat_name |