summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'jjardon/pip_improvements' into 'master'"revert-abd0dbbaJavier Jardón2017-01-291-5/+11
* Merge branch 'jjardon/pip_improvements' into 'master' devcurmudgeon2017-01-221-11/+5
|\
| * install_dependencies.sh: Install python-pip from the distro packagesJavier Jardón2017-01-211-11/+5
|/
* Merge branch 'lc/copy_fs' into 'master' Ben Brown2016-12-132-17/+2
|\
| * Replace copy_all_files with copy_fsDaniel Firth2016-12-132-17/+2
|/
* Merge branch 'lc/precise_dependencies' into 'master' Javier Jardón2016-12-131-1/+1
|\
| * Use the precise dependencies to stop breakage in master.Daniel Firth2016-12-131-1/+1
|/
* Merge branch 'fix-prefix-collection' into 'master' locallycompact2016-12-121-6/+22
|\
| * Fix collection of prefixes to recursefix-prefix-collectionTristan Van Berkom2016-12-121-6/+22
|/
* Merge branch 'lc/multifsfix' into 'master' Javier Jardón2016-12-111-1/+1
|\
| * Strip leading slash from MultiFS search for _find_extensionsDaniel Firth2016-12-101-1/+1
|/
* Update README.md: Remove github bagde Javier Jardón2016-12-091-1/+0
* Merge branch 'lc/upgrade_fs' into 'master' Javier Jardón2016-12-092-3/+3
|\
| * Upgrade pyfilesystem to 2.0.0Daniel Firth2016-12-092-3/+3
|/
* Merge branch 'lc/python2.7-slim' into 'master' Javier Jardón2016-12-071-1/+1
|\
| * Change docker to python:2.7-slimDaniel Firth2016-12-071-1/+1
|/
* Merge branch 'jjardon/before_script' into 'master' Pedro Alvarez Piedehierro2016-12-071-8/+4
|\
| * .gitlab-ci.yml: clone definitions in the 'before_script:' stepjjardon/before_scriptJavier Jardón2016-12-061-8/+4
|/
* Merge branch 'lc/revert-py3.4' into 'master' locallycompact2016-11-2922-533/+503
|\
| * Revert "Update code to python3"lc/revert-py3.4Daniel Firth2016-11-2915-65/+74
| * Revert "Update ci to py3 with onbuild docker"Daniel Firth2016-11-292-24/+10
| * Revert "pep8"Daniel Firth2016-11-293-7/+5
| * Revert "repos.py, cache.py, utils.py: Do not import app"Daniel Firth2016-11-293-2/+3
| * Revert "Move log functions to utils.py"Daniel Firth2016-11-2912-145/+134
| * Revert "WIP: Put the config in a different file?"Daniel Firth2016-11-2913-116/+110
| * Revert "Move chdir, timer to utils; fix circular deps"Daniel Firth2016-11-2915-213/+200
| * Revert "Stop submodule error hiding, parse as unicode"Daniel Firth2016-11-291-17/+23
| * Revert "Try with 3.4-onbuild"Daniel Firth2016-11-291-1/+1
| * Revert "Stop hiding exceptions"Daniel Firth2016-11-292-5/+4
| * Revert "Change shebang to '#!/usr/bin/python3'"Daniel Firth2016-11-297-9/+9
| * Revert "install_dependencies.sh: Use 'python3 get-pip.py'"Daniel Firth2016-11-291-1/+2
|/
* Merge branch 'lc/py3.4' into 'master' devcurmudgeon2016-11-2822-503/+533
|\
| * install_dependencies.sh: Use 'python3 get-pip.py'lc/py3.4Javier Jardón2016-11-161-2/+1
| * Change shebang to '#!/usr/bin/python3'Javier Jardón2016-11-167-9/+9
| * Stop hiding exceptionsDaniel Firth2016-11-162-4/+5
| * Try with 3.4-onbuildDaniel Firth2016-11-161-1/+1
| * Stop submodule error hiding, parse as unicodeDaniel Firth2016-11-161-23/+17
| * Move chdir, timer to utils; fix circular depsDaniel Firth2016-11-1615-200/+213
| * WIP: Put the config in a different file?Javier Jardón2016-11-1513-110/+116
| * Move log functions to utils.pyJavier Jardón2016-11-1512-134/+145
| * repos.py, cache.py, utils.py: Do not import appJavier Jardón2016-11-153-3/+2
| * pep8Daniel Firth2016-11-153-5/+7
| * Update ci to py3 with onbuild dockerDaniel Firth2016-11-152-10/+24
| * Update code to python3Daniel Firth2016-11-1515-74/+65
|/
* Merge branch 'jjardon/tacgomes/artifact-splitting' into 'master' Ana2016-11-151-25/+17
|\
| * Include all artifacts if not explicitly givenTiago Gomes2016-11-151-25/+17
|/
* Merge branch 'lc/peg' into 'master' devcurmudgeon2016-11-043-19/+17
|\
| * peg requirements at exact versionslc/pegDaniel Firth2016-11-033-19/+17
|/
* Merge branch 'ps/ci-tweaks' into 'master' devcurmudgeon2016-10-302-4/+33
|\
| * Add check for cache_keys_v6 to gitlab-ciPaul Sherwood2016-10-301-1/+15