Merge branch 'release/0.149.0'

.coveragerc

@@ -1,11 +1,11 @@
 [run]
-include =
-    api/*
-    framework/*
-    scripts/*
-    website/*
 omit =
     *tests/*
+    */migrations/*
+    */settings/*
+    */templates/*
+    */wsgi.py
+
 [report]
 exclude_lines =
     raise NotImplementedError

.travis.yml

@@ -34,7 +34,7 @@ env:
     - BOTO_CONFIG=/dev/null
   matrix:
     - TEST_BUILD="addons"
-    - TEST_BUILD="else"
+    - TEST_BUILD="website"
     - TEST_BUILD="api1_and_js"
     - TEST_BUILD="api2"
     - TEST_BUILD="api3_and_osf"
@@ -131,21 +131,28 @@ install:
     - travis_retry pip install flake8==2.4.0 --force-reinstall --upgrade
     - travis_retry invoke wheelhouse --dev --addons
 
-    - nvm install 8.6.0
-    - nvm use 8.6.0
-    - curl -o- -L https://yarnpkg.com/install.sh | bash
-    - export PATH=$HOME/.yarn/bin:$PATH
+    - |
+      if [ "$TEST_BUILD" = "api1_and_js" ]; then
+       nvm install 8.6.0
+       nvm use 8.6.0
+       curl -o- -L https://yarnpkg.com/install.sh | bash
+       export PATH=$HOME/.yarn/bin:$PATH
+       travis_retry invoke assets --dev
+      fi
 
     - travis_retry invoke travis_addon_settings
     - travis_retry invoke requirements --dev --addons
     # Hack to fix package conflict between uritemplate and uritemplate.py (dependency of github3.py)
     - pip uninstall uritemplate.py --yes
     - pip install uritemplate.py==0.3.0
-    - travis_retry invoke assets --dev
 
 # Run Python tests (core and addon) and JS tests
 script:
-    - invoke test_travis_$TEST_BUILD -n 4
+    - export COVERAGE=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "--coverage"; else echo ""; fi`
+    - invoke test_travis_$TEST_BUILD -n 4 $COVERAGE
+
+after_success:
+    - if [[ "$TRAVIS_BRANCH" == "master" ]]; then coveralls; fi
 
 before_cache:
   - rm -Rf $HOME/.cache/pip/http

CHANGELOG

@@ -2,8 +2,16 @@
 Changelog
 *********
 
+0.149.0 (2018-07-22)
+====================
+
+- Remove "Copy citations" button for Zotero folders and optimize loading large folders.
+- Improve speed of test suite.
+- Admin: Add ability to remove stuck registrations
+
 0.148.0 (2018-07-18)
 ====================
+
 - Create RegistrationProvider model
 - Create PreprintWithdrawalRequest model
 - Add collections logos to project overview
@@ -15,6 +23,7 @@ Changelog
 
 0.147.0 (2018-07-11)
 ====================
+
 - Add choices for ProviderAssetFileNames
 - Add Comments to Reviews email
 - Add ProviderAssetFile API endpoints, AbstractProvider relationship
@@ -67,6 +76,7 @@ Changelog
 
 0.142.0 (2018-05-29)
 ====================
+
 - Add UI with metadata when a project is in a public collection
 - Add /v2/providers/<type> routes, version out /preprint_providers/
 - Add post-submission call-to-action emails for preprints

README.md

@@ -2,6 +2,8 @@
 
 The code for [https://osf.io](https://osf.io).
 
+[![Coverage Status](https://coveralls.io/repos/github/CenterForOpenScience/osf.io/badge.svg)](https://coveralls.io/github/CenterForOpenScience/osf.io)
+
 - `master` Build Status: [![Build Status](https://travis-ci.org/CenterForOpenScience/osf.io.svg?branch=master)](https://travis-ci.org/CenterForOpenScience/osf.io)
 - `develop` Build Status: [![Build Status](https://travis-ci.org/CenterForOpenScience/osf.io.svg?branch=develop)](https://travis-ci.org/CenterForOpenScience/osf.io)
 - Public Repo: https://github.com/CenterForOpenScience/osf.io/