Fix wheel packages with _ in their name not being converted to - #555
Conversation
Codecov Report
@@ Coverage Diff @@
## master #555 +/- ##
==========================================
+ Coverage 94.43% 94.44% +<.01%
==========================================
Files 18 18
Lines 3127 3130 +3
Branches 402 402
==========================================
+ Hits 2953 2956 +3
Misses 126 126
Partials 48 48
Continue to review full report at Codecov.
|
|
Can you update your commit message with specific packages that have this issue? It'd be great just to have some real world data here. |
chalice/deploy/packager.py
Outdated
| @@ -499,6 +499,7 @@ def _calculate_name_and_version(self): | |||
| # {distribution}-{version}(-{build tag})?-{python tag}-{abi tag}- | |||
| # {platform tag}.whl | |||
| name, version = self.filename.split('-')[:2] | |||
| name = name.replace('_', '-') | |||
There was a problem hiding this comment.
It might be smart to use the PEP 503 normalization rules here, or at least in the __eq__() implementation.
There was a problem hiding this comment.
Ill update the commit and look at PEP 503
Since wheel files use - as a delimeter between the different components of the filename such as distribution-version-... if the distribution has - in it they are converted to _. So when we read a wheel file that has _ in the distribution, they need to be remaped to -. An example of a package that has this issue is `googleapis-common-protos`.
Add an integration test for a package with hyphens in the name. Changed the renaming to follow PEP 503 rather than just replacing _ with -.
stealthycoin
force-pushed
the
fix-underscore-wheel-names
branch
from
b1c2738
to
4242f49
Compare
tests/integration/test_package.py
Outdated
| f.write('%s\n' % package) | ||
| cli_factory = factory.CLIFactory(app_skeleton) | ||
| package_output_location = os.path.join(app_skeleton, 'pkg') | ||
| print(package_output_location) |
| 'debug': False, | ||
| 'factory': cli_factory}) | ||
| assert result.exit_code == 0 | ||
| assert result.output.strip() == 'Creating deployment package.' |
There was a problem hiding this comment.
Can we actually assert that the package dir looks correct? It doesn't have to be detailed, but this test would pass with code that literally did print "Creating deployment pakage."
Since wheel files use - as a delimeter between the different
components of the filename such as distribution-version-... if the
distribution has - in it they are converted to _. So when we read a
wheel file that has _ in the distribution, they need to be remaped to
-.
cc @jamesls @kyleknap @dstufft