Skip to content

Commit

Permalink
try to fix Travis configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
PetrDlouhy committed Apr 13, 2020
1 parent 01b7af8 commit f4d8ae5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 28 deletions.
1 change: 1 addition & 0 deletions .env.travis
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DJANGO_SETTINGS_MODULE="project.settings.local_sample"
29 changes: 7 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
dist: bionic
sudo: false
language: python
services:
- xvfb
env:
global:
- PIPENV_VENV_IN_PROJECT=1
- PIPENV_IGNORE_VIRTUALENVS=1
- SECRET_KEY="testing_unsecret_key"
matrix:
- DJANGO_VERSION="Django>=1.10,<1.11"
- DJANGO_VERSION="Django>=1.11,<1.12"
- DJANGO_VERSION="Django>=2.0,<2.1"
- DJANGO_VERSION="Django>=2.1,<2.2"
- DJANGO_VERSION="Django>=2.2,<3.0"
- DJANGO_VERSION="Django>=3.0,<3.1"
- DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
python:
- "3.5"
- "3.6"
- "3.7"
before_install:
Expand All @@ -26,15 +20,15 @@ install:
- pipenv install --dev
- pipenv run pip install flake8_strict
before_script:
- cp .env.travis .env
- npm install
- npm install -g bower less jshint
- pipenv run pip install -q $DJANGO_VERSION
- jshint apps/cyklomapa/static/js/*
- npm install [email protected] -g # higher version fails for compress
- psql -c 'create database travis_ci_test;' -U postgres
- psql --no-password travis_ci_test -U postgres -c "create extension postgis"
- cd project && cp settings_local_sample.py settings_local.py && cd ..
- pipenv run pip install -q $DJANGO_VERSION
- pipenv run python manage.py collectstatic --noinput
- python manage.py collectmedia --noinput
- ./update.sh no_virtualenv
script:
- django-admin --version
Expand All @@ -43,20 +37,11 @@ script:
after_script:
- coveralls
addons:
postgresql: "9.6"
postgresql: "10"
apt:
packages:
- postgresql-9.6-postgis-2.4
- postgresql-10-postgis-2.5
- gdal-bin
matrix:
exclude:
- python: "2.7"
env: DJANGO_VERSION="Django>=2.0,<2.1"
- python: "2.7"
env: DJANGO_VERSION="Django>=2.1,<2.2"
- python: "2.7"
env: DJANGO_VERSION="Django>=2.2,<3.0"
- python: "2.7"
env: DJANGO_VERSION="Django>=3.0,<3.1"
allow_failures:
- env: DJANGO_VERSION="Django>=3.0,<3.1"
- env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
File renamed without changes.
7 changes: 1 addition & 6 deletions update.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
#version 0.3

app_name=pnk
Expand All @@ -23,11 +23,6 @@ fi

pipenv install --python=python3

if [ "$1" != "no_virtualenv" ]; then
echo activate
pipenv shell
fi

if [ "$1" != "no_virtualenv" ]; then
pipenv install "Django<3.0" --upgrade
fi
Expand Down

0 comments on commit f4d8ae5

Please sign in to comment.