Merge pull request #2 from berkeley-dsep-infra/staging

Merging main staging into my fork.
berkeley-dsep-infra · Sep 13, 2017 · aab95ec · aab95ec
2 parents b5d3820 + 5997755
commit aab95ec
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/datahub/config.yaml b/datahub/config.yaml
@@ -1,4 +1,4 @@
-version: "v0.5.0-6f28c19"
+version: "v0.5.0-89f95ba"
 
 
 hub:

diff --git a/travis/travis-script.bash b/travis/travis-script.bash
@@ -12,6 +12,10 @@ if [[ ${ACTION} == 'build' ]]; then
         docker login -u $DOCKER_USERNAME -p "$DOCKER_PASSWORD"
     fi
 
+    # Attempt to improve relability of pip installs:
+    # https://github.com/travis-ci/travis-ci/issues/2389
+    sudo sysctl net.ipv4.tcp_ecn=0
+
     ./deploy.py build --commit-range ${TRAVIS_COMMIT_RANGE} ${PUSH}
 elif [[ ${ACTION} == 'deploy' ]]; then
     echo "Starting deploy..."

diff --git a/user-image/Dockerfile b/user-image/Dockerfile
@@ -46,7 +46,7 @@ RUN python3.6 -m venv ${APP_DIR}/venv
 
 RUN pip install --no-cache-dir \
       notebook==5.0.0 \
-      git+https://github.com/jupyterhub/jupyterhub@e1531ec2 \
+      git+https://github.com/jupyterhub/jupyterhub@0.8.0b5 \
       ipywidgets==6.0.0 \
       jupyterlab==0.26.5
 
@@ -77,7 +77,7 @@ RUN pip install git+https://github.com/data-8/nbresuse.git@2f9144f && \
 	jupyter nbextension     enable  --sys-prefix --py nbresuse
 
 # interact notebook extension
-RUN pip install git+https://github.com/data-8/gitautosync@ef77091 && \
+RUN pip install git+https://github.com/data-8/gitautosync@28897b8 && \
 	jupyter serverextension enable  --sys-prefix --py nbgitautosync
 
 # gmaps notebook extension 
@@ -94,4 +94,9 @@ ENV NETRC /srv/app/.netrc
 COPY netrc-gen /tmp/netrc-gen
 RUN /tmp/netrc-gen ${NETRC}
 
+# Install and enable nbdime! This should help with merge conflicts
+RUN pip install --no-cache-dir nbdime
+COPY gitconfig /etc/gitconfig
+COPY gitattributes /etc/gitattributes
+
 EXPOSE 8888
diff --git a/user-image/gitattributes b/user-image/gitattributes
@@ -0,0 +1,2 @@
+*.ipynb diff=jupyternotebook
+*.ipynb merge=jupyternotebook
diff --git a/user-image/gitconfig b/user-image/gitconfig
@@ -0,0 +1,13 @@
+[diff "jupyternotebook"]
+        command = git-nbdiffdriver diff
+[merge "jupyternotebook"]
+        driver = git-nbmergedriver merge --input-strategy=use-local --output-strategy=remove %O %A %B %L %P
+        name = jupyter notebook merge driver
+[difftool "nbdime"]
+        cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\"
+[difftool]
+        prompt = false
+[mergetool "nbdime"]
+        cmd = git-nbmergetool --input-strategy=use-local --output-strategy=remove merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
+[mergetool]
+        prompt = false
diff --git a/user-image/requirements.txt b/user-image/requirements.txt
@@ -22,6 +22,7 @@ ggplot==0.11.5
 # ls 88-5; text
 gensim==2.3.0
 nltk==3.2.4
+beautifulsoup4==4.6.0
 #
 # Modules
 scikit-learn==0.19.0
@@ -32,3 +33,4 @@ networkx==1.11
 #
 # phys 151;
 emcee==2.2.1
+#
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		*.ipynb diff=jupyternotebook
		*.ipynb merge=jupyternotebook