Skip to content
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

Update files #104

Merged
merged 4 commits into from
May 21, 2018
Merged

Update files #104

merged 4 commits into from
May 21, 2018

Conversation

ocefpaf
Copy link
Member

@ocefpaf ocefpaf commented May 21, 2018

I thinks this should fix the source tarball. See conda-forge/cf_units-feedstock#14 for the failures we are getting with the latest PyPI tarball.

@@ -1,7 +1,6 @@
include *.rst
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm counting on #103 for this change 😄

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though, it will need to be replaced with *.md...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P.S. You have write access on this repo @ocefpaf. Why count on it, and not feel free to just merge 😜.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do for simpler things, but it turns out I needed a review on this one after all.

@@ -1,2 +0,0 @@
[System]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, this is still valid (XML file, not .so).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, yep! (I guess I need to fix our conda recipe too.)

MANIFEST.in Outdated
include *.txt
recursive-include cf_units *.py
include cf_units/etc/site.cfg.template
include cf_units/etc/_udunits2.pxd
Copy link
Member

@pelson pelson May 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc?

Could you simply remove these lines and update the recursive include:

recursive-include cf_units *.py *.pxd *.pyx

@pelson
Copy link
Member

pelson commented May 21, 2018

I've fixed this locally with:

--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include *.rst
 include *.txt
-recursive-include cf_units *.py
+recursive-include cf_units *.py *.pxd *.pyx
 include cf_units/etc/site.cfg.template
 include CHANGES COPYING COPYING.LESSER INSTALL
 include versioneer.py

(tested and 👍)

@pelson
Copy link
Member

pelson commented May 21, 2018

Excellent! Thanks @ocefpaf.

@pelson pelson merged commit bb2911c into SciTools:master May 21, 2018
@ocefpaf ocefpaf deleted the update_files branch May 21, 2018 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants