-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26 from pinax/django-upgrade
Django upgrade
- Loading branch information
Showing
20 changed files
with
417 additions
and
213 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| version: 2.0 | ||
|
|
||
| common: &common | ||
| working_directory: ~/repo | ||
| steps: | ||
| - checkout | ||
| - restore_cache: | ||
| keys: | ||
| - v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }} | ||
| - v2-deps- | ||
| - 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.1 | ||
| environment: | ||
| - TOXENV=checkqa | ||
| - UPLOAD_COVERAGE=0 | ||
| py27dj18: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:2.7 | ||
| environment: | ||
| TOXENV=py27-dj18 | ||
| py27dj110: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:2.7 | ||
| environment: | ||
| TOXENV=py27-dj110 | ||
| py27dj111: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:2.7 | ||
| environment: | ||
| TOXENV=py27-dj111 | ||
| py34dj18: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:3.4 | ||
| environment: | ||
| TOXENV=py34-dj18 | ||
| py34dj110: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:3.4 | ||
| environment: | ||
| TOXENV=py34-dj110 | ||
| py34dj111: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:3.4 | ||
| environment: | ||
| TOXENV=py34-dj111 | ||
| py34dj20: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:3.4 | ||
| environment: | ||
| TOXENV=py34-dj20 | ||
| py35dj18: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:3.5 | ||
| environment: | ||
| TOXENV=py35-dj18 | ||
| py35dj110: | ||
| <<: *common | ||
| docker: | ||
| - image: circleci/python:3.5 | ||
| environment: | ||
| TOXENV=py35-dj110 | ||
| 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 | ||
| - py27dj18 | ||
| - py27dj110 | ||
| - py27dj111 | ||
| - py34dj18 | ||
| - py34dj110 | ||
| - py34dj111 | ||
| - py34dj20 | ||
| - py35dj18 | ||
| - py35dj110 | ||
| - py35dj111 | ||
| - py35dj20 | ||
| - py36dj111 | ||
| - py36dj20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,44 @@ | ||
| build | ||
| dist | ||
| .coverage | ||
| .tox | ||
| MANIFEST | ||
| *.pyc | ||
| *.egg-info | ||
| *.egg | ||
| .DS_Store | ||
|
|
||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
| *.py[cod] | ||
|
|
||
| # Distribution / packaging | ||
| .Python | ||
| env/ | ||
| build/ | ||
| develop-eggs/ | ||
| dist/ | ||
| docs/_build/ | ||
| htmlcov/ | ||
| .eggs/ | ||
| eggs/ | ||
| lib/ | ||
| lib64/ | ||
| parts/ | ||
| sdist/ | ||
| var/ | ||
| *.egg-info/ | ||
| .installed.cfg | ||
| *.egg | ||
| *.eggs | ||
| .python-version | ||
| .pep8 | ||
|
|
||
| # 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/ |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,4 @@ Thomas Schreiber | |
| John Franey | ||
| Graham Ullrich | ||
| Ethan A Kent | ||
| Katherine “Kati” Michel | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.