diff options
| -rw-r--r-- | .travis.yml | 23 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | appveyor.yml | 11 | ||||
| -rw-r--r-- | ci_tools/pypy_upgrade.sh | 11 |
4 files changed, 43 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 67695c8..eec752e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,38 @@ python: - "3.5" - "pypy" - "pypy3" + +matrix: + # pypy3 latest version is not playing nice. + allow_failures: + - python: "pypy3" + before_install: + # Travis version of Pypy is old and is causing some jobs to fail, so + # we should build this ourselves + - "export PYENV_ROOT=$HOME/.pyenv" + - | + if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then + export PYPY_VERSION="5.4.1" + source ./ci_tools/pypy_upgrade.sh + fi + # Install codecov - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install coverage==3.7.1; fi - pip install codecov + install: - pip install six - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi - ./ci_tools/retry.sh python updatezinfo.py + +cache: + directories: + - $HOME/.pyenv + - $HOME/.cache/pip + script: - coverage run --omit=setup.py,dateutil/test/* setup.py test + after_success: - codecov @@ -124,7 +124,7 @@ previous release. A table of release signing keys can be found below: =========== ============================ Releases Signing key fingerprint =========== ============================ -2.4.1- `0xCD54FCE3D964BEFB`_ +2.4.1- `6B49 ACBA DCF6 BD1C A206 67AB CD54 FCE3 D964 BEFB`_ =========== ============================ Testing @@ -139,5 +139,5 @@ To easily test dateutil against all supported Python versions, you can use All github pull requests are automatically tested using travis and appveyor. -.. _0xCD54FCE3D964BEFB: +.. _6B49 ACBA DCF6 BD1C A206 67AB CD54 FCE3 D964 BEFB: https://pgp.mit.edu/pks/lookup?op=vindex&search=0xCD54FCE3D964BEFB
\ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index e52e64f..68f32c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,12 +14,15 @@ install: - set path=c:\Program Files\PostgreSQL\9.3\bin\;%PATH% - set path=%PATH%;%PYTHON%;%PYTHON%/Scripts + # If this isn't done, I guess Appveyor will install to the Python2.7 version + - set pip_cmd=%PYTHON%/python.exe -m pip + # Download scripts and dependencies - ps: Start-FileDownload 'https://bootstrap.pypa.io/get-pip.py' - - "python get-pip.py" - - "pip install six" - - "pip install coverage" - - "pip install codecov" + - "%PYTHON%/python.exe get-pip.py" + - "%pip_cmd% install six" + - "%pip_cmd% install coverage" + - "%pip_cmd% install codecov" # This frequently fails with network errors, so we'll retry it up to 5 times # with a 1 minute rate limit. diff --git a/ci_tools/pypy_upgrade.sh b/ci_tools/pypy_upgrade.sh new file mode 100644 index 0000000..e66c025 --- /dev/null +++ b/ci_tools/pypy_upgrade.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# Need to install an upgraded version of pypy. +if [ -f "$PYENV_ROOT/bin/pyenv" ]; then + pushd "$PYENV_ROOT" && git pull && popd +else + rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT" +fi + +"$PYENV_ROOT/bin/pyenv" install --skip-existing "pypy-$PYPY_VERSION" +virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION" +source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
\ No newline at end of file |