Skip to content

Commit

Permalink
Merge pull request #33 from eldarion/django-20
Browse files Browse the repository at this point in the history
Add Django v1.11, 2.0 support
  • Loading branch information
grahamu authored Feb 23, 2018
2 parents d7336ba + b5ef88d commit 64e31ed
Show file tree
Hide file tree
Showing 65 changed files with 2,134 additions and 1,124 deletions.
95 changes: 95 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
version: 2.0

common: &common
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
- v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
- run:
name: install dependencies
command: pip install --user tox
- run:
name: run tox
command: ~/.local/bin/tox
- run:
name: upload coverage report
command: |
if [[ "$UPLOAD_COVERAGE" != 0 ]]; then
PATH=$HOME/.local/bin:$PATH
pip install --user codecov
coverage xml
~/.local/bin/codecov --required -X search gcov pycov -f coverage.xml --flags $CIRCLE_JOB
fi
- save_cache:
paths:
- .tox
- ~/.cache/pip
- ~/.local
- ./eggs
key: v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}

jobs:
lint:
<<: *common
docker:
- image: circleci/python:3.6
environment:
- TOXENV=checkqa
- UPLOAD_COVERAGE=0
py27dj111:
<<: *common
docker:
- image: circleci/python:2.7
environment:
TOXENV=py27-dj111
py34dj111:
<<: *common
docker:
- image: circleci/python:3.4
environment:
TOXENV=py34-dj111
py34dj20:
<<: *common
docker:
- image: circleci/python:3.4
environment:
TOXENV=py34-dj20
py35dj111:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj111
py35dj20:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV=py35-dj20
py36dj111:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV=py36-dj111
py36dj20:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV=py36-dj20

workflows:
version: 2
test:
jobs:
- lint
- py27dj111
- py34dj111
- py34dj20
- py35dj111
- py35dj20
- py36dj111
- py36dj20
7 changes: 0 additions & 7 deletions .coveragerc

This file was deleted.

50 changes: 43 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,45 @@
docs/_build
formly.egg-info
dist
*.pyc
.coverage
.tox
MANIFEST
.DS_Store

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]


# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
docs/_build/
eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
*.eggs
.python-version
.eggs/

# Pipfile
Pipfile
Pipfile.lock

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.cache
nosetests.xml
coverage.xml

# IDEs
.idea/
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

7 changes: 7 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Patrick Altman
Luke Hatcher
Ben Bliss
James Tauber
Jake Wegner
Ronan Amicel
Graham Ullrich
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
all: init docs test
all: init test

init:
python setup.py develop
pip install detox coverage mkdocs
pip install detox coverage

test:
coverage erase
detox
coverage html

docs:
mkdocs build

.PHONY: docs
Loading

0 comments on commit 64e31ed

Please sign in to comment.