Skip to content

Commit 9f5d516

Browse files
author
Aaron VanDerlip
authored
Merge pull request #4 from safarijv/feature/RAMP-38-update-from-upstream
RAMP-38 | Updates from upstream
2 parents d95783a + 3c19397 commit 9f5d516

File tree

84 files changed

+2329
-1048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2329
-1048
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ docs/_build/
1313
.eggs/
1414
.python-version
1515
.vscode
16+
.pytest_cache/

.travis.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
language: python
2-
python:
3-
- "2.7"
4-
- "3.4"
5-
- "3.5"
6-
- "3.6"
7-
env:
8-
- DJANGO=1.7
9-
- DJANGO=1.8
10-
- DJANGO=1.9
11-
- DJANGO=1.10
12-
- DJANGO=1.11
13-
matrix:
14-
exclude:
15-
- python: "3.5"
16-
env: DJANGO=1.7
17-
- python: "3.6"
18-
env: DJANGO=1.7
2+
193
install:
204
- pip install tox coveralls
5+
matrix:
6+
include:
7+
- python: 2.7
8+
env:
9+
- ENV=docs
10+
- python: 2.7
11+
env:
12+
- ENV=py27-django111
13+
- python: 3.5
14+
env:
15+
- ENV=py35-django111,py35-django20,py35-django21
16+
- python: 3.6
17+
env:
18+
- ENV=py36-django111,py36-django20,py36-django21
2119
script:
22-
- tox -e py${TRAVIS_PYTHON_VERSION//[.]/}-django${DJANGO//[.]/}
20+
- tox -e $ENV
2321
after_success:
2422
- coveralls

CHANGELOG.md

Lines changed: 0 additions & 322 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2017 Juan Ignacio Fiorentino
3+
Copyright (c) 2014-2019 Juan Ignacio Fiorentino
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)