Merge branch 'release/0.119.0'

Author: sloria

.gitignore

@@ -148,7 +148,6 @@ logs/*
 src/
 website/mfrtemp/
 docs/_build
-website/static/img/badges
 
 # Scripts
 scripts/guid_blacklist.txt

.npmrc

@@ -0,0 +1 @@
+optional = false

CHANGELOG

@@ -2,6 +2,28 @@
 Changelog
 *********
 
+0.119.0 (2017-08-10)
+====================
+
+- Add Bitbucket addon.
+- Prevent UnorderedObjectListWarning in API
+- Prevent invalid social fields from being passed to user endpoints.
+- Admin: Fix importing preprint providers on production
+- Remove "Watch project" code
+- Make ever_mentioned a ManyToMany field
+- Remove unused mongo code in framework.mongo
+- Reduce number of queries made by triggered mails script
+- Add a context manager to prevent auto_now fields from from getting updated during migrations
+- Remove model name aliasing in imports
+- Remove dead badges code
+- Add view OSF Subjects Permissions
+- Upgrade to Node.js 8
+- Checkouts and is_preprint checks need optimizing
+- Expand functionality of maintenance notice to allow custom message and severity level
+- Test optimizations
+- Add preprint_word field to preprint provider endpoints
+- Add event tracking to navbar
+
 0.118.0 (2017-08-03)
 ====================
 

Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update \
         libxml2-dev \
         libxslt1-dev \
         zlib1g-dev \
+        curl \
         # matplotlib
         libfreetype6-dev \
         libxft-dev \
@@ -34,38 +35,68 @@ RUN apt-get update \
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.4
 RUN apt-get update \
-    && apt-get install -y \
-        curl \
     && gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
     && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
     && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
     && gpg --verify /usr/local/bin/gosu.asc \
     && rm /usr/local/bin/gosu.asc \
     && chmod +x /usr/local/bin/gosu \
     && apt-get clean \
-    && apt-get autoremove -y \
-        curl \
     && rm -rf /var/lib/apt/lists/*
 
-# Node : https://registry.hub.docker.com/u/library/node/
-ENV NODE_VERSION 0.12.4
-ENV NPM_VERSION 2.10.1
-RUN apt-get update \
-    && apt-get install -y \
-        curl \
-    && gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D \
-    && curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
-    && curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
-    && gpg --verify SHASUMS256.txt.asc \
-    && grep " node-v$NODE_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt.asc | sha256sum -c - \
-    && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
-    && rm "node-v$NODE_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc \
-    && npm install -g npm@"$NPM_VERSION" \
-    && npm cache clear \
-    && apt-get clean \
-    && apt-get autoremove -y \
-        curl \
-    && rm -rf /var/lib/apt/lists/*
+# https://github.com/nodejs/docker-node/blob/9c25cbe93f9108fd1e506d14228afe4a3d04108f/8.2/Dockerfile
+# gpg keys listed at https://github.com/nodejs/node#release-team
+RUN set -ex \
+  && for key in \
+    9554F04D7259F04124DE6B476D5A82AC7E37093B \
+    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    56730D5401028683275BD23C23EFEFE93C4CFFFE \
+  ; do \
+    gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+    gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
+    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
+  done
+
+ENV NPM_CONFIG_LOGLEVEL info
+ENV NODE_VERSION 8.2.1
+
+RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
+  && case "${dpkgArch##*-}" in \
+    amd64) ARCH='x64';; \
+    ppc64el) ARCH='ppc64le';; \
+    *) echo "unsupported architecture"; exit 1 ;; \
+  esac \
+  && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
+  && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+  && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
+  && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
+  && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 \
+  && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+ENV YARN_VERSION 0.27.5
+
+RUN set -ex \
+  && for key in \
+    6A010C5166006599AA17F08146C2130DFD2497F5 \
+  ; do \
+    gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+    gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
+    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
+  done \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+  && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && mkdir -p /opt/yarn \
+  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
+  && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
+  && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
+  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
 
 RUN mkdir -p /code
 WORKDIR /code
@@ -75,6 +106,7 @@ RUN pip install -U pip
 COPY ./requirements.txt /code/
 COPY ./requirements/ /code/requirements/
 
+COPY ./addons/bitbucket/requirements.txt /code/addons/bitbucket/
 COPY ./addons/box/requirements.txt /code/addons/box/
 COPY ./addons/dataverse/requirements.txt /code/addons/dataverse/
 COPY ./addons/dropbox/requirements.txt /code/addons/dropbox/
@@ -89,6 +121,7 @@ RUN pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/re
     && pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/requirements/release.txt
 
 RUN pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/addons/box/requirements.txt \
+    && pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/addons/bitbucket/requirements.txt \
     && pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/addons/dataverse/requirements.txt \
     && pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/addons/dropbox/requirements.txt \
     && pip install --no-cache-dir -c /code/requirements/constraints.txt -r /code/addons/github/requirements.txt \
@@ -111,7 +144,7 @@ RUN npm install bower \
     && ./node_modules/bower/bin/bower install --allow-root \
     && ./node_modules/bower/bin/bower cache clean --allow-root
 
-COPY ./package.json /code/
+COPY ./package.json ./.npmrc /code/
 RUN npm install --production
 
 COPY ./tasks /code/tasks
@@ -125,6 +158,7 @@ RUN mv /code/website/settings/local-dist.py /code/website/settings/local.py \
 
 COPY ./webpack* /code/
 COPY ./website/static /code/website/static/
+COPY ./addons/bitbucket/static/ /code/addons/bitbucket/static/
 COPY ./addons/box/static/ /code/addons/box/static/
 COPY ./addons/citations/static/ /code/addons/citations/static/
 COPY ./addons/dataverse/static/ /code/addons/dataverse/static/
@@ -144,9 +178,9 @@ RUN mkdir -p /code/website/static/built/ \
     && invoke build_js_config_files \
     && node ./node_modules/webpack/bin/webpack.js --config webpack.prod.config.js \
     # && rm -rf /code/node_modules \ (needed for sharejs)
-    && npm install list-of-licenses \
+    && npm install @centerforopenscience/list-of-licenses \
     && rm -rf /root/.npm \
-    && npm cache clean
+    && npm cache clean --force
 # /OSF: Assets
 
 # Admin: Assets
@@ -167,7 +201,7 @@ COPY ./admin/static /code/admin/static/
 
 RUN node ./node_modules/webpack/bin/webpack.js --config webpack.prod.config.js \
     && rm -rf /root/.npm \
-    && npm cache clean
+    && npm cache clean --force
 
 WORKDIR /code
 # /Admin: Assets