From 648b0c1afd7624311607f504d4e0b54f341ef5eb Mon Sep 17 00:00:00 2001 From: jbloom Date: Wed, 30 Sep 2020 12:18:38 -0700 Subject: [PATCH 1/4] pin_logging --- baselayer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baselayer b/baselayer index b969743..0371d75 160000 --- a/baselayer +++ b/baselayer @@ -1 +1 @@ -Subproject commit b9697431cc914601ce7ec2386ada641429f7addf +Subproject commit 0371d7507f1186a03a9a331661c557ba83b0b412 From 863159456761d54b109ea575933c9cf0027a23d9 Mon Sep 17 00:00:00 2001 From: jbloom Date: Wed, 30 Sep 2020 12:28:37 -0700 Subject: [PATCH 2/4] remove specified linux distro --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index eacb31d..b5b7fe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ language: python -dist: trusty sudo: required cache: # See http://docs.travis-ci.com/user/caching/#pip-cache @@ -59,10 +58,12 @@ addons: - libnss3 - libgconf-2-4 postgresql: "9.6" +services: + - xvfb matrix: include: - - python: 3.6 + - python: 3.7 env: - TEST_TARGET=test From dffc4bf9ba5726f717e348a507bb57ac4699b40d Mon Sep 17 00:00:00 2001 From: jbloom Date: Wed, 30 Sep 2020 12:34:38 -0700 Subject: [PATCH 3/4] update npm --- .travis/travis_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/travis_install.sh b/.travis/travis_install.sh index 44c2dff..337ea5f 100755 --- a/.travis/travis_install.sh +++ b/.travis/travis_install.sh @@ -14,7 +14,7 @@ hash -d pip # find upgraded pip section_end "install.base.requirements" section "install.baselayer.requirements" -npm -g install npm@4.2.0 +npm -g install npm@5.8.0 npm --version node --version From d8ad38412b6d7a03eb33a5d78f4d6165551269c6 Mon Sep 17 00:00:00 2001 From: jbloom Date: Wed, 30 Sep 2020 12:43:50 -0700 Subject: [PATCH 4/4] remove xvfb --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5b7fe7..c558b34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,8 +58,6 @@ addons: - libnss3 - libgconf-2-4 postgresql: "9.6" -services: - - xvfb matrix: include: