Ensure older Docker Compose version works

pull/351/head
lukasmartinelli 2016-06-14 20:01:22 +02:00
rodzic 6dbd02b2a6
commit d6da42c012
3 zmienionych plików z 6 dodań i 6 usunięć

Wyświetl plik

@ -13,4 +13,4 @@ before_install:
install: "pip install -r ./tools/integration-test/requirements.txt"
script:
# Test import
- py.test -x ./tools/integration-test/integration_test.py
- py.test -xv ./tools/integration-test/integration_test.py

Wyświetl plik

@ -22,14 +22,14 @@ function main() {
fi
# Generate patch sources first but do not upload them
python create_extracts.py zoom-level "$WORLD_MBTILES" \
python -u create_extracts.py zoom-level "$WORLD_MBTILES" \
--max-zoom=5 --target-dir="$EXTRACT_DIR"
python create_extracts.py zoom-level "$WORLD_MBTILES" \
python -u create_extracts.py zoom-level "$WORLD_MBTILES" \
--max-zoom=8 --target-dir="$EXTRACT_DIR"
python create_extracts.py bbox "$WORLD_MBTILES" "$CITIES_TSV" \
python -u create_extracts.py bbox "$WORLD_MBTILES" "$CITIES_TSV" \
--patch-from="$PATCH_SRC" --target-dir="$EXTRACT_DIR" $upload_flag
python create_extracts.py bbox "$WORLD_MBTILES" "$COUNTRIES_TSV" \
python -u create_extracts.py bbox "$WORLD_MBTILES" "$COUNTRIES_TSV" \
--patch-from="$PATCH_SRC" --target-dir="$EXTRACT_DIR" $upload_flag
}

Wyświetl plik

@ -42,7 +42,7 @@ class DockerCompose(object):
def remove_all(self):
self.compose(['stop'])
self.compose(['rm', '-v', '--all', '--force'])
self.compose(['rm', '-v', '--force'])
@pytest.mark.run(order=1)