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

Added hv.examples to copy notebooks locally #1368

Merged
merged 11 commits into from
Jun 29, 2017
Merged

Conversation

jlstevens
Copy link
Contributor

There may be a better approach but this stuff is very tricky. I'm fairly sure this approach will work:

1 - Set pypi_version(True) only when building for PyPI.
2 - Get conda to copy the notebooks to a path in the same way datashader does it.

import os, glob
from shutil import copytree, ignore_patterns

candidates = [os.path.join(__path__[0], '../doc/Tutorials/'), # local doc available
Copy link
Member

Choose a reason for hiding this comment

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

"local doc available" means git? If so maybe say so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I mean git. I'll update shortly.

setup.py Outdated
if __name__=="__main__":
def pypi_version(pypi=False):
if not pypi: return
# Make sure to create these directories and populate them before upload
Copy link
Member

Choose a reason for hiding this comment

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

Not sure what that comment means; surely there is no manual step involved?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right now there is a manual step. Populating the pseudo packages is also a manual step.

I'm all in favor of replacing the manual steps with something else... as long as it works!

Copy link
Member

Choose a reason for hiding this comment

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

Right. I don't see any reason to have a manual step!

@philippjfr
Copy link
Member

Any idea what these errors are about? Somehow option IDs are now wrong: https://travis-ci.org/ioam/holoviews/jobs/225631022

@jlstevens
Copy link
Contributor Author

@philippjfr Thanks for doing this and I do think it is the right approach.

As I don't think our notebooks are quite ready to ship in the current state, I'm assigning this to the 1.8 milestone.

@jlstevens jlstevens added this to the v1.8 milestone Apr 25, 2017
@jlstevens jlstevens modified the milestones: v1.7.1, v1.8 May 5, 2017
@jlstevens
Copy link
Contributor Author

I've reassigned this to 1.7.1 as the notebooks and examples should be presentable at that point.

@philippjfr
Copy link
Member

Will have to update this once we have all the assets and examples in place.

@@ -35,7 +35,7 @@ install:
conda install python=3.4.3;
fi
- rm -r $SITE_PACKAGES/numpy*
- python setup.py install
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why did this need to change?

Copy link
Member

Choose a reason for hiding this comment

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

So it skips installing the examples mainly. If you use develop then the examples are already in a place where it will find them.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense, thanks.

@jlstevens
Copy link
Contributor Author

There seems to be an issue with having to run python setup.py sdist twice but otherwise this seems to be working. Merging.

@jlstevens jlstevens merged commit b2c33ba into master Jun 29, 2017
@philippjfr philippjfr deleted the examples_function branch July 31, 2017 22:57
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.

None yet

3 participants