From f31e395a69a9d7c36e80bc901a32c7a15e7a9ed7 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 12 Jan 2020 01:44:16 +0200 Subject: [PATCH 1/2] [WIP] fix test failures when submitting from upstream branches --- tests/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/__init__.py b/tests/__init__.py index 434d8c2e22..168416773d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -34,3 +34,4 @@ def noop(): nproc_soft, nproc_hard = resource.getrlimit(resource.RLIMIT_NPROC) resource.setrlimit(resource.RLIMIT_NPROC, (nproc_hard, nproc_hard)) +pass From d989663c2acedaa3867b8f74a824a861a6ee2f5f Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 12 Jan 2020 02:08:09 +0200 Subject: [PATCH 2/2] travis: fix aws config condition --- scripts/ci/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index f3b9647e48..883557a3e1 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -14,8 +14,7 @@ $scriptdir/retry.sh pip install .[all,tests] git config --global user.email "dvctester@example.com" git config --global user.name "DVC Tester" -if [[ "$TRAVIS_PULL_REQUEST" == "false" && \ - "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then +if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY aws configure set region us-east-2