Skip to content

Commit c9daa36

Browse files
committed
Merge branch 'release/0.122.0'
2 parents f99ffe1 + 74f0151 commit c9daa36

File tree

293 files changed

+7309
-20081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+7309
-20081
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ node_modules
66
**/bower_components
77
*.pyc
88
**/*.pyc
9+
docker*

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ python:
77

88
sudo: false
99

10+
addons:
11+
chrome: stable
12+
1013
cache:
14+
yarn: true
1115
directories:
1216
- $HOME/.cache
1317
- node_modules
@@ -38,6 +42,7 @@ before_install:
3842
mkdir -p $HOME/.cache/downloads
3943
mkdir -p $HOME/.cache/pip
4044
mkdir -p $HOME/.cache/wheelhouse
45+
rm -rf node_modules ## TODO remove this later
4146
# postgres
4247
- |
4348
cd $HOME/.cache/downloads
@@ -76,6 +81,16 @@ before_install:
7681
mkdir -p /tmp/elasticsearch
7782
tar xzf $ELASTICSEARCH_ARCHIVE -C /tmp/elasticsearch --strip-components=1
7883
- /tmp/elasticsearch/bin/elasticsearch > /dev/null & export ELASTICSEARCH_PID=$!
84+
# Wait for elasticsearch to come online
85+
- |-
86+
while true; do
87+
sleep 5
88+
curl -sf http://localhost:9200/_cluster/health?wait_for_status=yellow
89+
if [ $? -eq 0 ]; then
90+
break
91+
fi
92+
done
93+
7994
# varnish
8095
# - |
8196
# cd $HOME/.cache/downloads
@@ -102,9 +117,10 @@ before_install:
102117
# /tmp/varnish/usr/sbin/varnishd -n /tmp -p feature=+esi_disable_xml_check -p vmod_dir=/tmp/varnish/usr/lib/varnish/vmods -F -f $PROJECT_DIR/tests/test_files/varnish.vcl -a *:8080 > /dev/null & export VARNISH_PID=$!
103118
# fi
104119
install:
105-
- nvm install 0.12.4
106-
- nvm use 0.12.4
107-
- npm install -g npm@2.10.1
120+
- nvm install 8.6.0
121+
- nvm use 8.6.0
122+
- curl -o- -L https://yarnpkg.com/install.sh | bash
123+
- export PATH=$HOME/.yarn/bin:$PATH
108124
- cd $PROJECT_DIR
109125
- cp website/settings/local-travis.py website/settings/local.py
110126
- cp api/base/settings/local-travis.py api/base/settings/local.py
@@ -113,7 +129,6 @@ install:
113129
- travis_retry pip install --upgrade pip
114130
- travis_retry pip install invoke==0.13.0
115131
- travis_retry pip install flake8==2.4.0 --force-reinstall --upgrade
116-
- travis_retry npm install jshint
117132
- travis_retry invoke wheelhouse --dev --addons
118133
- travis_retry invoke travis_addon_settings
119134
- travis_retry invoke requirements --dev --addons
@@ -135,9 +150,6 @@ before_cache:
135150
- rm -f $HOME/.cache/wheelhouse/httpretty-*.whl
136151
- rm -f $HOME/.cache/wheelhouse/mendeley-*.whl
137152
- rm -f $HOME/.cache/wheelhouse/feedparser-*.whl
138-
# exclude npm from github repo's
139-
- rm -Rf node_modules/dropzone
140-
- rm -Rf node_modules/treebeard
141153
# kill any running processes
142154
- kill -9 $POSTGRES_PID
143155
- kill -9 $ELASTICSEARCH_PID

.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--ignore-engines true

CHANGELOG

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog
33
*********
44

5+
0.122.0 (2017-10-16)
6+
====================
7+
- Probabilistic test failures due to uniqueness constraint on usernames
8+
- View-only link returns 403 for add-on files
9+
- Test failure test_get_preprint_count
10+
- Templating nodes that are linked to each other hit max recursion
11+
- Add MarXiv logo for sign up page
12+
- Add EarthArXiv logo for sign up page
13+
- Audit and fixing of wrapping across site
14+
- Make the sitemap raise first 10 issues to sentry then log the rest
15+
- Remove "Preprints" from Thesis Commons Register page
16+
- Remove unused scripts
17+
518
0.121.0 (2017-10-01)
619
====================
720

0 commit comments

Comments
 (0)