Clone, don't pip install modularcrypto packages
diff --git a/.travis.yml b/.travis.yml
index 9888694..a216222 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,49 +79,21 @@
brew update;
brew install pypy;
/usr/local/bin/pip_pypy install flake8 coverage;
- echo "Installing other modularcrypto packages";
- /usr/local/bin/pip_pypy install https://github.com/wbond/oscrypto/archive/master.zip;
- /usr/local/bin/pip_pypy install https://github.com/wbond/certbuilder/archive/master.zip;
- /usr/local/bin/pip_pypy install https://github.com/wbond/certvalidator/archive/master.zip;
- /usr/local/bin/pip_pypy install https://github.com/wbond/csrbuilder/archive/master.zip;
- /usr/local/bin/pip_pypy install https://github.com/wbond/crlbuilder/archive/master.zip;
- /usr/local/bin/pip_pypy install https://github.com/wbond/ocspbuilder/archive/master.zip;
export PYTHON_BIN=/usr/local/bin/pypy;
else
if [ "$PYTHON_VERSION" == "3.6" ]; then
brew update;
brew install python3;
/usr/local/bin/pip3 install flake8 coverage;
- echo "Installing other modularcrypto packages";
- /usr/local/bin/pip3 install https://github.com/wbond/oscrypto/archive/master.zip;
- /usr/local/bin/pip3 install https://github.com/wbond/certbuilder/archive/master.zip;
- /usr/local/bin/pip3 install https://github.com/wbond/certvalidator/archive/master.zip;
- /usr/local/bin/pip3 install https://github.com/wbond/csrbuilder/archive/master.zip;
- /usr/local/bin/pip3 install https://github.com/wbond/crlbuilder/archive/master.zip;
- /usr/local/bin/pip3 install https://github.com/wbond/ocspbuilder/archive/master.zip;
export PYTHON_BIN=/usr/local/bin/python3;
else
if [ "$PYTHON_VERSION" == "2.7" ]; then
curl --silent --show-error https://bootstrap.pypa.io/get-pip.py | sudo /usr/bin/python2.7;
sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'flake8', 'coverage'])";
- echo "Installing other modularcrypto packages";
- sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/oscrypto/archive/master.zip'])";
- sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/certbuilder/archive/master.zip'])";
- sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/certvalidator/archive/master.zip'])";
- sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/csrbuilder/archive/master.zip'])";
- sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/crlbuilder/archive/master.zip'])";
- sudo /usr/bin/python2.7 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/ocspbuilder/archive/master.zip'])";
export PYTHON_BIN=/usr/bin/python2.7;
else
curl --silent --show-error https://bootstrap.pypa.io/get-pip.py | sudo /usr/bin/python2.6 -W ignore;
sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'coverage'])";
- echo "Installing other modularcrypto packages";
- sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/oscrypto/archive/master.zip'])";
- sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/certbuilder/archive/master.zip'])";
- sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/certvalidator/archive/master.zip'])";
- sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/csrbuilder/archive/master.zip'])";
- sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/crlbuilder/archive/master.zip'])";
- sudo /usr/bin/python2.6 -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/ocspbuilder/archive/master.zip'])";
export PYTHON_BIN=/usr/bin/python2.6;
fi;
fi;
@@ -132,15 +104,17 @@
else
pip install flake8 coverage;
fi;
- echo "Installing other modularcrypto packages";
- pip install https://github.com/wbond/oscrypto/archive/master.zip;
- pip install https://github.com/wbond/certbuilder/archive/master.zip;
- pip install https://github.com/wbond/certvalidator/archive/master.zip;
- pip install https://github.com/wbond/csrbuilder/archive/master.zip;
- pip install https://github.com/wbond/crlbuilder/archive/master.zip;
- pip install https://github.com/wbond/ocspbuilder/archive/master.zip;
export PYTHON_BIN=python;
fi;
+
+ echo "Checking out modularcrypto packages for coverage";
+ cd $TRAVIS_BUILD_DIR/..;
+ git clone https://github.com/wbond/oscrypto.git;
+ git clone https://github.com/wbond/certbuilder.git;
+ git clone https://github.com/wbond/certvalidator.git;
+ git clone https://github.com/wbond/crlbuilder.git;
+ git clone https://github.com/wbond/csrbuilder.git;
+ git clone https://github.com/wbond/ocspbuilder.git;
script:
- $PYTHON_BIN run.py ci
after_success:
diff --git a/appveyor.yml b/appveyor.yml
index f59bea3..ac11fdc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,12 +54,6 @@
}
& "${env:PYTHON}\pypy.exe" "${env:PYTMP}\get-pip.py";
& "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install flake8 coverage;
- & "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/oscrypto/archive/master.zip;
- & "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/certbuilder/archive/master.zip;
- & "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/certvalidator/archive/master.zip;
- & "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/csrbuilder/archive/master.zip;
- & "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/crlbuilder/archive/master.zip;
- & "${env:PYTHON}\bin\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/ocspbuilder/archive/master.zip;
} elseif ("${env:PYTHON_ID}" -eq "26" -or "${env:PYTHON_ID}" -eq "26-x64") {
if (!(Test-Path "${env:PYTMP}\get-pip.py")) {
@@ -67,24 +61,19 @@
}
& "${env:PYTHON}\python.exe" -W ignore "${env:PYTMP}\get-pip.py";
# Skip flake8 for 2.6 since flake8 and pycodestyle have deprecated support for it
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'coverage'])";
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/oscrypto/archive/master.zip'])";
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/certbuilder/archive/master.zip'])";
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/certvalidator/archive/master.zip'])";
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/csrbuilder/archive/master.zip'])";
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/crlbuilder/archive/master.zip'])";
- & "${env:PYTHON}\python.exe" -W ignore -c "import pip; pip.main(['--disable-pip-version-check', '--quiet', 'install', 'https://github.com/wbond/ocspbuilder/archive/master.zip'])";
} else {
& "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install flake8 coverage;
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/oscrypto/archive/master.zip;
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/certbuilder/archive/master.zip;
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/certvalidator/archive/master.zip;
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/csrbuilder/archive/master.zip;
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/crlbuilder/archive/master.zip;
- & "${env:PYTHON}\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/wbond/ocspbuilder/archive/master.zip;
}
+ cd "c:\projects\";
+ git clone https://github.com/wbond/oscrypto.git;
+ git clone https://github.com/wbond/certbuilder.git;
+ git clone https://github.com/wbond/certvalidator.git;
+ git clone https://github.com/wbond/crlbuilder.git;
+ git clone https://github.com/wbond/csrbuilder.git;
+ git clone https://github.com/wbond/ocspbuilder.git;
+
& "C:\Python27-x64\Scripts\pip.exe" --disable-pip-version-check --quiet install https://github.com/codecov/codecov-python/archive/v2.0.6.zip;
- "SET PATH=%PYTHON%;%PATH%"
cache: