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

[MRG] preassembly for conda/python #743

Merged
merged 12 commits into from Jul 19, 2019

Conversation

@minrk
Copy link
Member

minrk commented Jul 16, 2019

re-issue of #410 based on #716

  • conda preassembles unless there are local pip requirements
  • requirements.txt preassembles unless there are local refs (e.g. -e .)
  • pipenv always preassembles (may need local ref check like requirements.txt?)
minrk added 4 commits Feb 9, 2018
- get_assemble_files() returns list of files needed for assembly
- if buildpack.assemble_with_subset is set, only load assemble_files
  prior to running assembly scripts. Load the rest of the repo afterward

conda opts in to this, but currently I think this works
for everything *except* requirements.txt
allows assemble_from_subset when requirements.txt doesn't contain any local references
@minrk minrk force-pushed the minrk:conda-env-first-again-again branch from e96622c to 4f3f192 Jul 16, 2019
@meeseeksmachine

This comment has been minimized.

Copy link

meeseeksmachine commented Jul 16, 2019

This pull request has been mentioned on Jupyter Community Forum. There might be relevant details there:

https://discourse.jupyter.org/t/tip-embed-custom-github-content-in-a-binder-link-with-nbgitpuller/922/50

@betatim

This comment has been minimized.

Copy link
Member

betatim commented Jul 16, 2019

I think a environment.yml with - -r requirements.txt in the pip section is legal. At least I have a vague memory that when I investigated last I found this out. Something to double check.

@minrk

This comment has been minimized.

Copy link
Member Author

minrk commented Jul 18, 2019

I bumped the local pip check up one so that it applies to conda as well (adding unittests, too)

save preassembly of pipenv for a later patch
@minrk

This comment has been minimized.

Copy link
Member Author

minrk commented Jul 18, 2019

I decided to save pipenv for the preassembly for another PR, since that should be done by parsing the Pipfile toml, which is added in #748.

Co-Authored-By: Tim Head <betatim@gmail.com>
@minrk minrk changed the title preassembly for conda/python [MRG] preassembly for conda/python Jul 19, 2019
@betatim betatim merged commit 6c5c09b into jupyter:master Jul 19, 2019
3 checks passed
3 checks passed
ci/circleci: build_docs Your tests passed on CircleCI!
Details
ci/dockercloud Your tests passed in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@betatim

This comment has been minimized.

Copy link
Member

betatim commented Jul 19, 2019

Bimbambosch! Nice work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.