Merge pull request #137 from Yelp/less-flaky-mirrors
Use less flaky mirrors, add python3.6
This commit is contained in:
commit
8e103bbb8b
5 changed files with 34 additions and 18 deletions
|
@ -2,38 +2,38 @@
|
||||||
sha: 003e43251aea1da33f2072f2365ec8b9ceaae070
|
sha: 003e43251aea1da33f2072f2365ec8b9ceaae070
|
||||||
hooks:
|
hooks:
|
||||||
- id: autopep8-wrapper
|
- id: autopep8-wrapper
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: check-added-large-files
|
- id: check-added-large-files
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: check-docstring-first
|
- id: check-docstring-first
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: check-yaml
|
- id: check-yaml
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: debug-statements
|
- id: debug-statements
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: detect-private-key
|
- id: detect-private-key
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: double-quote-string-fixer
|
- id: double-quote-string-fixer
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: flake8
|
- id: flake8
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: name-tests-test
|
- id: name-tests-test
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: requirements-txt-fixer
|
- id: requirements-txt-fixer
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- repo: https://github.com/asottile/reorder_python_imports.git
|
- repo: https://github.com/asottile/reorder_python_imports.git
|
||||||
sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
|
sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
|
||||||
hooks:
|
hooks:
|
||||||
- id: reorder-python-imports
|
- id: reorder-python-imports
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
- repo: https://github.com/Lucas-C/pre-commit-hooks.git
|
- repo: https://github.com/Lucas-C/pre-commit-hooks.git
|
||||||
sha: 181a63c511691da58116fa19a7241956018660bc
|
sha: 181a63c511691da58116fa19a7241956018660bc
|
||||||
hooks:
|
hooks:
|
||||||
- id: remove-tabs
|
- id: remove-tabs
|
||||||
language_version: python3.5
|
language_version: python3.6
|
||||||
|
|
|
@ -2,6 +2,11 @@ FROM debian:stretch
|
||||||
|
|
||||||
MAINTAINER Chris Kuehl <ckuehl@yelp.com>
|
MAINTAINER Chris Kuehl <ckuehl@yelp.com>
|
||||||
|
|
||||||
|
# The default mirrors are too flaky to run reliably in CI.
|
||||||
|
RUN sed -E \
|
||||||
|
'/security\.debian/! s@http://[^/]+/@http://mirrors.kernel.org/@' \
|
||||||
|
-i /etc/apt/sources.list
|
||||||
|
|
||||||
# Install the bare minimum dependencies necessary for working with Debian
|
# Install the bare minimum dependencies necessary for working with Debian
|
||||||
# packages. Build dependencies should be added under "Build-Depends" inside
|
# packages. Build dependencies should be added under "Build-Depends" inside
|
||||||
# debian/control instead.
|
# debian/control instead.
|
||||||
|
|
|
@ -2,6 +2,11 @@ if grep -qE '\<lucid\>' /etc/apt/sources.list; then
|
||||||
# lucid was archived, breaking the base image
|
# lucid was archived, breaking the base image
|
||||||
# https://github.com/docker-library/official-images/issues/1902
|
# https://github.com/docker-library/official-images/issues/1902
|
||||||
sed -i 's/archive\.ubuntu\.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
|
sed -i 's/archive\.ubuntu\.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
|
||||||
|
else
|
||||||
|
# The default mirrors are too flaky to run reliably in CI.
|
||||||
|
sed -E \
|
||||||
|
'/security\.debian/! s@http://[^/]+/@http://mirrors.kernel.org/@' \
|
||||||
|
-i /etc/apt/sources.list
|
||||||
fi
|
fi
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
|
|
|
@ -3,15 +3,21 @@ set -o pipefail
|
||||||
|
|
||||||
. /mnt/ci/docker
|
. /mnt/ci/docker
|
||||||
|
|
||||||
|
# The default mirrors are too flaky to run reliably in CI.
|
||||||
|
sed -E \
|
||||||
|
'/security\.debian/! s@http://[^/]+/@http://mirrors.kernel.org/@' \
|
||||||
|
-i /etc/apt/sources.list
|
||||||
|
|
||||||
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0x5BB92C09DB82666C
|
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0x5BB92C09DB82666C
|
||||||
echo 'deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu xenial main' >> /etc/apt/sources.list
|
echo 'deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu xenial main' >> /etc/apt/sources.list
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
git \
|
git \
|
||||||
python2.6-dev \
|
python2.6-dev \
|
||||||
python2.7-dev \
|
python2.7-dev \
|
||||||
python3.4-dev \
|
python3.5-dev \
|
||||||
python3.5-dev
|
python3.6-dev
|
||||||
|
|
||||||
# We cannot use the Ubuntu versions of tox or virtualenv:
|
# We cannot use the Ubuntu versions of tox or virtualenv:
|
||||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754248
|
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754248
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -1,5 +1,5 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py26,py27,py34,py35
|
envlist = py26,py27,py35,py36
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
deps = -r{toxinidir}/requirements-dev.txt
|
deps = -r{toxinidir}/requirements-dev.txt
|
||||||
|
|
Loading…
Reference in a new issue