From 98cc14c622d93117a39c10c9520513ace147c294 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 5 Jul 2018 14:00:36 -0400 Subject: [PATCH] misc cleanups --- .circleci/config.yml | 2 -- .circleci/setup-virtualenv.sh | 4 ---- 2 files changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab63f2f01..5eadd5077 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,7 +85,6 @@ jobs: # readable. working_directory: "/tmp" command: | - env /tmp/project/.circleci/setup-virtualenv.sh "${TAHOE_LAFS_TOX_ENVIRONMENT}" "${TAHOE_LAFS_TOX_ARGS}" - run: &RUN_TESTS @@ -94,7 +93,6 @@ jobs: # if the working directory is not readable. working_directory: "/tmp" command: | - env /tmp/project/.circleci/run-tests.sh "${TAHOE_LAFS_TOX_ENVIRONMENT}" "${TAHOE_LAFS_TOX_ARGS}" - store_artifacts: &STORE_TEST_LOG diff --git a/.circleci/setup-virtualenv.sh b/.circleci/setup-virtualenv.sh index 600647672..ad83f1804 100755 --- a/.circleci/setup-virtualenv.sh +++ b/.circleci/setup-virtualenv.sh @@ -10,10 +10,6 @@ shift || : # non-root user. See below. sudo --set-home -u nobody virtualenv --python python2.7 /tmp/tests -# Slackware has non-working SSL support in setuptools until certifi is -# installed. SSL support in setuptools is needed in case packages use -# `setup_requires` which gets satisfied by setuptools instead of by pip. -# txi2p (vcversioner) is one such package. Twisted (incremental) is another. sudo --set-home -u nobody /tmp/tests/bin/pip install tox codecov # Get everything else installed in it, too.