mirror
/
repo2docker
kopia lustrzana https://github.com/jupyterhub/repo2docker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
1 605 Commity
5 Gałęzie
22 Tagi
7,1 MiB
Wykres commitów

1605 Commity (7e4b1bd34db6ebc6c0d41f2bcb8b8e832172932c)

Autor SHA1 Wiadomość Data
Joseph Hamman 05273abb38 fix bash spacing 2019-04-29 08:52:18 -07:00
Chris Holdgraf c9a161746d
Update CONTRIBUTING.md 
Co-Authored-By: KirstieJane <kw401@cam.ac.uk>
 2019-04-29 16:40:02 +01:00
Chris Holdgraf f3e004dd19
Update CONTRIBUTING.md 
Co-Authored-By: KirstieJane <kw401@cam.ac.uk>
 2019-04-29 16:39:49 +01:00
Joseph Hamman 7ac4cb4932 error if both binder and .binder dirs exist 2019-04-29 08:05:49 -07:00
Kirstie Whitaker 6cd3d1d895
Update .github/ISSUE_TEMPLATE/feature_request.md 2019-04-29 15:09:42 +01:00
Joseph Hamman e83b12f5b2 add missing break 2019-04-29 06:47:51 -07:00
Joseph Hamman 3c0ceaacc2 clarify that only one of binder and .binder can be used at once 2019-04-28 20:28:09 -07:00
Chris Holdgraf 7681a6c774
[MRG] Update issue templates (#654) 
[MRG] Update issue templates
 2019-04-28 16:50:45 -07:00
Kirstie Whitaker 13922ee249 Embelish the links in contributing.md 2019-04-28 20:09:34 +01:00
Kirstie Whitaker 6c43fb927a Extend the points about feature requests & bug reports 2019-04-28 19:58:55 +01:00
Kirstie Whitaker 5a7add7929 Update process and guidelines for making contribution 2019-04-28 19:41:33 +01:00
Kirstie Whitaker a27420e29f Add types of contributions section 2019-04-28 19:11:32 +01:00
Kirstie Whitaker 1e0eb726ce Make html comments all on one long line 2019-04-28 18:25:57 +01:00
Kirstie Whitaker 6ff13e9162 Add comments and additional structure to feature request 2019-04-28 18:25:25 +01:00
Kirstie Whitaker 1d9a64551f Add html comments to bug report 2019-04-28 18:12:23 +01:00
Tim Head 991a6826a8
Tweak bug report template 2019-04-28 18:31:46 +02:00
Tim Head e3ee8afa6f Update issue templates 2019-04-28 13:02:41 +02:00
Joseph Hamman 3941a92a7d fix missing () 2019-04-27 17:16:14 -07:00
Joseph Hamman c230c70f4e support for .binder directory 2019-04-27 17:01:20 -07:00
Tim Head 24eb3f923a Fix handling of memory limit command line argument 
If a string of only numerals is passed as argument we assume it should
be converted to an integer and specifies a size in bytes.
 2019-04-27 10:49:32 +02:00
Min RK 2acf0974c3 miniconda is 4.6.14 2019-04-26 16:25:41 +02:00
Min RK 186e1bbc5d repo-path verifies conda prefix 2019-04-26 16:15:40 +02:00
Min RK 9b7618cb79 refreeze 2019-04-26 16:14:30 +02:00
Min RK 109793bffd conda 4.6.14 2019-04-26 16:09:00 +02:00
Min RK 1f7d91af5f Merge remote-tracking branch 'jhamman/bump_conda_ver' into conda-env 2019-04-26 16:05:38 +02:00
Min RK 70d950cc05 install python2 kernelspec into notebook env 
like other things, this was always the right thing to do,
but more important now that notebook prefix is not the same as CONDA_DIR
 2019-04-25 17:00:13 +02:00
Min RK 51f15ee7bd update some tests with new expectations 
- conda is not importable in the frontmost python
- sys.executable is in $NB_PYTHON_PREFIX (this was true before, but it's value has changed)
 2019-04-25 16:51:05 +02:00
Min RK 5f285b74e8 verify conda activation (and thereby entrypoint) 
in tests/conda/simple

use pytest for better error reporting
 2019-04-25 16:11:23 +02:00
Min RK 36ac03fd9d env is a prefix now 2019-04-25 15:58:44 +02:00
Min RK 15a23711e6 invoke start script from our entrypoint 
rather than replacing our entrypoint
 2019-04-25 15:56:26 +02:00
Min RK 9678dde251 install notebook in its own env 
leave the conda root env alone

adds conda activation to profile.d and ensures that we
start with a login shell via the ENTRYPOINT
 2019-04-25 15:44:51 +02:00
Yuvi Panda bc9554e18c
[MRG] Bump nteract-on-jupyter to 2.0.12 and notebook to 5.7.8 (#650) 
[MRG] Bump nteract-on-jupyter to 2.0.12 and notebook to 5.7.8
 2019-04-24 13:00:57 -07:00
Tim Head 9599b0a43e Bump nteract-on-jupyter to 2.0.12 and notebook to 5.7.8 2019-04-24 20:11:46 +02:00
Min RK eb551eb248
Merge pull request #647 from betatim/unpin-pip 
[MRG] Unpin pip again
 2019-04-23 14:44:23 +02:00
Erik Sundell a1a6746db3 Fix Pipfile + binder-folder support 2019-04-21 23:55:15 +02:00
Erik Sundell b80aba447c Add Pipfile + binder-folder tests 2019-04-21 23:45:27 +02:00
Erik Sundell cf71b80cef Detect python_(full_)version in Pipfile(.lock) 
Give priority to Pipfile.lock, then Pipfile, then runtime.txt.
 2019-04-21 23:26:33 +02:00
Erik Sundell 4bde9f05c3 Add Pipfile.lock to py36 test 2019-04-21 23:26:21 +02:00
Erik Sundell 330ac775d3 Add Pipfile + runtime.txt test 2019-04-21 21:46:52 +02:00
Erik Sundell 33970685bd Add Pipfile + Pipfile.lock BuildPack logic 
This is the actual meat while most previous commits were tests to verify
that this worked as intented. The tests paid off quickly as this was
quite hard to get working at all.

- We can not use `pipenv shell` inside this script.
- We must use `--system` and therefore `pipenv install` that supports it
rather than `pipenv sync` that doesn.
- We must generate a `Pipfile.lock` if there are none.
- We must use `--ignore-pipfile` and `--deploy` on the `pipenv install`
command in order to mimic how a `pipenv sync` would have worked.
 2019-04-21 17:37:14 +02:00
Erik Sundell 97c26641c3 Optimize Pipfile + environment.yml test 
Why install a big package when we can install a trivial one?
 2019-04-21 17:34:29 +02:00
Erik Sundell e107360d97 Improve Pipfile + requirements.txt test 
Previously we did not check that requirements.txt was ignored properly,
now we do.
 2019-04-21 17:33:44 +02:00
Erik Sundell d019f4980a Clarify Pipfile + Pipfile.lock test 2019-04-21 17:32:46 +02:00
Erik Sundell a59e169e2f Fix the Pipfile + setup.py tests 
Apparently testing to import the package will work no matter what as we
will find it locally so setup.py may not need to run. By adding a small
dependency I could check if the dependency is installed and now the
tests actually tests what they should.
 2019-04-21 17:30:36 +02:00
Erik Sundell d9e58c2634 Fix test description 2019-04-21 14:59:38 +02:00
Erik Sundell d8cfc50c50 Add test for Pipfile + Pipfile.lock 
We want to use the more specific version, Pipfile.lock, if it is
available. Are we ignoring the Pipfile if it is, as we should?
 2019-04-21 14:55:00 +02:00
Erik Sundell dff18e840d Add test for Pipfile + setup.py 
We want to ignore the setup.py file if it is around along with a
Pipfile.
 2019-04-21 14:53:05 +02:00
Erik Sundell 4b74a13364 Rethink setup.py with Pipfile 
As setup.py can be explicitly installed or not from a Pipfile I reasoned
that it should not be installed by default after pipenv has used
relevant Pipfiles.
 2019-04-21 14:51:11 +02:00
Erik Sundell c5dd7c8e45 Update .gitignore to avoid pytest scrap 2019-04-21 14:48:13 +02:00
Erik Sundell f995a995a9 Add Pipfile vs requirements.txt logic 2019-04-21 11:30:50 +02:00