diff --git a/.travis.yml b/.travis.yml index 9ac8480a0c..f071172322 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,6 @@ before_install: - sudo apt-get update - sudo apt-get install postgresql-9.6 - # Sometimes ya just halfta ... - - git clone -b "2.1.0" --depth 1 https://github.com/lloyd/yajl.git && cd yajl && ./configure && sudo make install && cd .. - - npm install marky-markdown # For ttw tests @@ -39,10 +36,8 @@ install: - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rf env; fi - touch requirements.txt package.json - make env -j2 - - env/bin/pip install --upgrade ijson==2.3.0 before_script: - echo "DATABASE_URL=dbname=gratipay" | tee -a tests/local.env local.env - - echo "REQUIRE_YAJL=true" | tee -a tests/local.env local.env - psql -U postgres -c 'CREATE DATABASE "gratipay";' - if [ "${TRAVIS_BRANCH}" = "master" -a "${TRAVIS_PULL_REQUEST}" = "false" ]; then rm -rfv tests/py/fixtures; fi script: LD_LIBRARY_PATH=/usr/local/lib xvfb-run make bgrun test doc -j2 diff --git a/bin/sync-npm.sh b/bin/sync-npm.sh deleted file mode 100755 index 9d8e4b97b5..0000000000 --- a/bin/sync-npm.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# This is a script to run under the Heroku Scheduler add-on to periodically -# sync our database with the npm registry. - -set -e -cd "$(dirname "$0")/.." - -# Install dependencies. -# ===================== - -# cmake - required by ... -curl https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz > cmake.tgz -echo '5df4b69d9e85093ae78b1070d5cb9f824ce0bdd02528948c3f6a740e240083e5 cmake.tgz' \ - | sha256sum -c /dev/stdin --status -tar zxf cmake.tgz -PATH=/app/cmake-3.6.2-Linux-x86_64/bin:$PATH - -# yajl -git clone -b "2.1.0" --depth 1 https://github.com/lloyd/yajl.git -cd yajl -./configure -p /app/.heroku/python -make install -cd .. - -# python -pip install ijson==2.3.0 -pip install -e . - - -# Sync with npm. -# ============== - -curl https://registry.npmjs.com/-/all | sync-npm serialize | sync-npm upsert diff --git a/defaults.env b/defaults.env index 9955681575..7b13b97749 100644 --- a/defaults.env +++ b/defaults.env @@ -103,6 +103,3 @@ PROJECT_REVIEW_USERNAME= PROJECT_REVIEW_TOKEN= RAISE_SIGNIN_NOTIFICATIONS=no - -# speeds up npm syncing; should be true on production and Travis -REQUIRE_YAJL=false diff --git a/gratipay/wireup.py b/gratipay/wireup.py index ae9a518f60..ad67959ab3 100644 --- a/gratipay/wireup.py +++ b/gratipay/wireup.py @@ -389,7 +389,6 @@ def env(): PROJECT_REVIEW_USERNAME = unicode, PROJECT_REVIEW_TOKEN = unicode, RAISE_SIGNIN_NOTIFICATIONS = is_yesish, - REQUIRE_YAJL = is_yesish, GUNICORN_OPTS = unicode, )