-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
gzip rule set files for wheel #2780
Conversation
setup.py
Outdated
'botocore': [ | ||
'cacert.pem', | ||
'data/*.json', | ||
'data/*/*.json', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not exactly sure how this line has ever worked for including service model files because they're all one directory level down from what this indicates. Doing the same with GZIP files in the same directory i.e. 'data/*/*.json.gz
did not work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't tested this, but I suspect this line in MANIFEST.in is responsible for the service model files. Both package_data
and MANIFEST.in
are ok ways to define what files to include, but using them both in parallel does seem a bit confusing...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think Jonas is right, having the recursive include is more complete and keeping the relevant files partitioned to the MANIFEST.in file may be better. Can we get this change migrated over to follow the pattern set already for *.json?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1, let's move this to MANIFEST.in.
Technically, we could also use globs in setup.py
with something like:
...
'data/**/*.json',
'data/**/*.json.gz`,
...
But @nateprewitt made me go look up when that feature was added to setuptools and it turns out to be less than half a year old: https://setuptools.pypa.io/en/latest/history.html#v62-3-0 (i.e. a bit too young to be ok to use for us)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok thanks guys! I should be able to shoot up an update in the morning.
Codecov ReportBase: 95.25% // Head: 95.28% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## develop #2780 +/- ##
===========================================
+ Coverage 95.25% 95.28% +0.03%
===========================================
Files 62 62
Lines 12907 12907
===========================================
+ Hits 12295 12299 +4
+ Misses 612 608 -4
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
392cf17
to
c069b82
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you accidently included all of the files zipped and removed the s3/s3control files. Could you make sure those get fixed and then we'll be ready to merge.
c069b82
to
c5155e4
Compare
This PR adds any service model file stored as a compressed GZIP JSON to be included in the wheel file that is pushed to PYPI as part of botocore's daily release cycle.