From 5dedec6fb8080fb8089e6f2f9274f2fba577cf87 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 17 Jun 2017 20:26:57 +0300 Subject: [PATCH] Use ppu to cleanup pip cache Use remove-old-files.py from ppu to cleanup pip cache at Travis and AppVeyor. --- .travis.yml | 5 ++++- appveyor.yml | 5 ++++- devscripts/requirements/requirements.txt | 1 - docs/news.rst | 6 ++++++ tox.ini | 16 +++++++++------- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1f382b..5a25883 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,10 @@ env: - TOXENV=py34-flake8 install: - - travis_retry pip install tox + - travis_retry pip install tox ppu script: - tox + +before_cache: + - remove-old-files.py -o 180 ~/.cache/pip diff --git a/appveyor.yml b/appveyor.yml index 2cc3783..0113fa5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -136,10 +136,13 @@ install: - "python --version" - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - "pip --version" - - "pip install tox" + - "pip install tox ppu" # No build step - we don't have C extensions build: false test_script: - "tox -e %TOX_ENV%" + +after_test: + - "remove-old-files.py -o 180 %LOCALAPPDATA%\\pip\\Cache" diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt index d1a7b7b..abe3d94 100644 --- a/devscripts/requirements/requirements.txt +++ b/devscripts/requirements/requirements.txt @@ -5,4 +5,3 @@ SQLObject>=2.2.1; python_version >= '2.7' and python_version < '3.0' SQLObject>=3.0.0; python_version >= '3.4' m_lib.defenc>=1.0 m_lib>=3.1 -ppu diff --git a/docs/news.rst b/docs/news.rst index cb8e9ba..dd51ecc 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -1,6 +1,12 @@ News ==== +Version 0.2.3 (2017-06-??) +-------------------------- + +* Use remove-old-files.py from ppu to cleanup pip cache + at Travis and AppVeyor. + Version 0.2.2 (2017-06-10) -------------------------- diff --git a/tox.ini b/tox.ini index c360621..ce326fb 100644 --- a/tox.ini +++ b/tox.ini @@ -19,17 +19,19 @@ passenv = PGPASSWORD sitepackages = True # Don't fail or warn on uninstalled commands whitelist_externals = - flake8 createdb dropdb + flake8 + cmp.py + rm.py [general] commands = {[testenv]commands} {envpython} -m pytest --cov=sqlconvert {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out - {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out - {envpython} {envbindir}/rm.py test.out + cmp.py -i tests/mysql2sql/test.out test.out + rm.py test.out [testenv:py27] commands = {[general]commands} @@ -88,9 +90,9 @@ commands = {[postgres-w32]commands} [sqlite] commands = {[testenv]commands} - -{envpython} {envbindir}/rm.py /tmp/test.sqdb + -rm.py /tmp/test.sqdb {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb - {envpython} {envbindir}/rm.py /tmp/test.sqdb + rm.py /tmp/test.sqdb [testenv:py27-sqlite] commands = {[sqlite]commands} @@ -107,9 +109,9 @@ commands = {[sqlite]commands} [sqlite-w32] commands = {[testenv]commands} - -{envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb + -rm.py C:/projects/sqlconvert/test.sqdb pytest --cov=sqlconvert -D sqlite:/C:/projects/sqlconvert/test.sqdb?debug=1 - {envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb + rm.py C:/projects/sqlconvert/test.sqdb [testenv:py27-sqlite-w32] commands = {[sqlite-w32]commands} -- 2.39.5