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

Switch back to a venv for docs + fix .circle config #130

Merged
merged 2 commits into from Aug 12, 2018

Conversation

yuvipanda
Copy link
Collaborator

  • Add tests

@yuvipanda
Copy link
Collaborator Author

Looks like there was a conflict in #124, which seems to have added an environment.yml file for docs and maybe removed the docs-requirement.txt file that the documentation integration test was looking for. Since there wasn't anything hard to do with pip in the environment.yml file, I've moved it back to requirements.txt file since it's easier to do that than try to convert the integration test container to have conda :)

@yuvipanda
Copy link
Collaborator Author

/cc @choldgraf FYI. LMK if you wanna revert to using environment.yml (I also changed RTD config to use the venv). I'm gonna merge this for now to unblock merging other PRs.

@yuvipanda yuvipanda merged commit 258e350 into jupyterhub:master Aug 12, 2018
@choldgraf
Copy link
Member

yo - I mostly copied over the environment.yml file because it was used in the other jupyterhub projects, and since it was the only way I could figure out how to get RTD builds working (but perhaps we can point the .readthedocs config file to the pip file instead). I'll try to take a look at it on my flight.

@choldgraf
Copy link
Member

Also - note that my intention was actually to use both environment.yml and a requirements.txt file. It's just that this is wrapped up in the still-unmerged PR from Zexuan's user test:

https://github.com/jupyterhub/the-littlest-jupyterhub/pull/123/files#diff-b0278a395ac6448087984d5186dbe855R9

@yuvipanda yuvipanda deleted the doc-it-fix branch August 16, 2018 22:30
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

2 participants