Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Django v1.11, 2.0 support #33

Merged
merged 36 commits into from
Feb 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0870340
Add Django v1.11, 2.0 support
grahamu Feb 14, 2018
6fc9eb9
Update README.md
grahamu Feb 14, 2018
a504c0b
Fix CI configuration
grahamu Feb 14, 2018
913072d
Add model tests
grahamu Feb 15, 2018
b632906
Remove "dt_" and "rt_" urlname prefixes
grahamu Feb 15, 2018
54f6dd5
plac8
grahamu Feb 15, 2018
eacf3c4
Remove f-strings; import mock
grahamu Feb 15, 2018
24d472b
Add doc section for Authentication Backend use
grahamu Feb 16, 2018
33e614b
fix typo
grahamu Feb 16, 2018
853148d
Add settings required to test views
grahamu Feb 16, 2018
0fe1c47
Add django-bootstrap-form test requirement
grahamu Feb 16, 2018
2e8f2c4
Add design view tests
grahamu Feb 16, 2018
70466c8
Re-sort imports
grahamu Feb 16, 2018
9d97b5b
Fix content decoding
grahamu Feb 16, 2018
fe18127
Update test tool requirements
grahamu Feb 16, 2018
fc8d3ff
Merge branch 'master' into django-20
grahamu Feb 21, 2018
9d8939e
Remove unused Page.move_up/move_down methods
grahamu Feb 22, 2018
e6a7ba0
Add Field method tests
grahamu Feb 22, 2018
d0bd49e
Rename view
grahamu Feb 22, 2018
cc1ac82
Add view tests
grahamu Feb 22, 2018
cd7b5a4
plac8
grahamu Feb 22, 2018
3604fc9
Update sorting config
grahamu Feb 22, 2018
f014b61
Fix form instantiation error
grahamu Feb 22, 2018
8633440
Remove pinax-theme-bootstrap template include
grahamu Feb 22, 2018
67c007f
Fix Field save() method
grahamu Feb 22, 2018
867a87c
Add more view tests
grahamu Feb 22, 2018
85b7941
plac8
grahamu Feb 22, 2018
be398cc
Update docstrings
grahamu Feb 23, 2018
06fd1f1
Revise template for pinax-theme-bootstrap removal
grahamu Feb 23, 2018
bc43ba5
Add Survey.get_run_url() convenience method
grahamu Feb 23, 2018
a1d8a81
Add "home" url for testing
grahamu Feb 23, 2018
77e7882
Use modern login required mixin
grahamu Feb 23, 2018
12fb4bb
Rename deletion views
grahamu Feb 23, 2018
d6d3c1b
Add view tests
grahamu Feb 23, 2018
db1e047
plac8
grahamu Feb 23, 2018
b5ef88d
Update test coverage configuration
grahamu Feb 23, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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