From 920f40889aeb667f73a1b02ed668ea6f12f5f8c3 Mon Sep 17 00:00:00 2001 From: Patrick Kaeding Date: Thu, 19 May 2016 16:43:01 -0700 Subject: [PATCH 1/3] upgrade setuptools in build --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index 08565ac2..197ad2a7 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,7 @@ +checkout: + post: + - pip install -U pip setuptools virtualenv + dependencies: pre: - pyenv shell 2.7.10; $(pyenv which pip) install --upgrade pip From 39bfefce94bbbe321e63b871ceaff5bf28c46454 Mon Sep 17 00:00:00 2001 From: Patrick Kaeding Date: Thu, 19 May 2016 16:47:50 -0700 Subject: [PATCH 2/3] upgrade setuptools in pyenv --- circle.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 197ad2a7..14a9ea28 100644 --- a/circle.yml +++ b/circle.yml @@ -1,18 +1,21 @@ -checkout: - post: - - pip install -U pip setuptools virtualenv - dependencies: pre: - pyenv shell 2.7.10; $(pyenv which pip) install --upgrade pip - pyenv shell 3.3.3; $(pyenv which pip) install --upgrade pip - pyenv shell 3.4.2; $(pyenv which pip) install --upgrade pip + + - pyenv shell 2.7.10; $(pyenv which pip) install -U pip setuptools virtualenv + - pyenv shell 3.3.3; $(pyenv which pip) install -U pip setuptools virtualenv + - pyenv shell 3.4.2; $(pyenv which pip) install -U pip setuptools virtualenv + - pyenv shell 2.7.10; $(pyenv which pip) install -r test-requirements.txt - pyenv shell 3.3.3; $(pyenv which pip) install -r test-requirements.txt - pyenv shell 3.4.2; $(pyenv which pip) install -r test-requirements.txt + - pyenv shell 2.7.10; $(pyenv which pip) install -r twisted-requirements.txt - pyenv shell 3.3.3; $(pyenv which pip) install -r twisted-requirements.txt - pyenv shell 3.4.2; $(pyenv which pip) install -r twisted-requirements.txt + - pyenv shell 2.7.10; $(pyenv which python) setup.py install - pyenv shell 3.3.3; $(pyenv which python) setup.py install - pyenv shell 3.4.2; $(pyenv which python) setup.py install From 25fe2671972ce03b94f5a760e65aecdf02c5e14a Mon Sep 17 00:00:00 2001 From: Patrick Kaeding Date: Thu, 19 May 2016 16:59:54 -0700 Subject: [PATCH 3/3] upgrade setuptools in pyenv --- circle.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index 14a9ea28..393d32cf 100644 --- a/circle.yml +++ b/circle.yml @@ -1,13 +1,9 @@ dependencies: pre: - - pyenv shell 2.7.10; $(pyenv which pip) install --upgrade pip - - pyenv shell 3.3.3; $(pyenv which pip) install --upgrade pip - - pyenv shell 3.4.2; $(pyenv which pip) install --upgrade pip - - - pyenv shell 2.7.10; $(pyenv which pip) install -U pip setuptools virtualenv - - pyenv shell 3.3.3; $(pyenv which pip) install -U pip setuptools virtualenv - - pyenv shell 3.4.2; $(pyenv which pip) install -U pip setuptools virtualenv - + - pyenv shell 2.7.10; $(pyenv which pip) install --upgrade pip setuptools + - pyenv shell 3.3.3; $(pyenv which pip) install --upgrade pip setuptools + - pyenv shell 3.4.2; $(pyenv which pip) install --upgrade pip setuptools + - pyenv shell 2.7.10; $(pyenv which pip) install -r test-requirements.txt - pyenv shell 3.3.3; $(pyenv which pip) install -r test-requirements.txt - pyenv shell 3.4.2; $(pyenv which pip) install -r test-requirements.txt @@ -15,7 +11,7 @@ dependencies: - pyenv shell 2.7.10; $(pyenv which pip) install -r twisted-requirements.txt - pyenv shell 3.3.3; $(pyenv which pip) install -r twisted-requirements.txt - pyenv shell 3.4.2; $(pyenv which pip) install -r twisted-requirements.txt - + - pyenv shell 2.7.10; $(pyenv which python) setup.py install - pyenv shell 3.3.3; $(pyenv which python) setup.py install - pyenv shell 3.4.2; $(pyenv which python) setup.py install