Skip to content

Commit

Permalink
Django 2.0 support for NestedTabularInline (fixes #97)
Browse files Browse the repository at this point in the history
  • Loading branch information
fdintino committed Apr 26, 2018
1 parent 19d6293 commit 110594e
Show file tree
Hide file tree
Showing 19 changed files with 75 additions and 48 deletions.
38 changes: 24 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,28 @@ language: python
matrix:
include:
- { python: 2.7, env: TOXENV=py27-dj18 }
- { python: 3.6, env: TOXENV=py36-dj18 }
- { python: 2.7, env: TOXENV=py27-dj18-grp }
- { python: 2.7, env: TOXENV=py27-dj18-suit }
- { python: 3.4, env: TOXENV=py34-dj18 }
- { python: 2.7, env: TOXENV=py27-dj19 }
- { python: 3.6, env: TOXENV=py36-dj19 }
- { python: 2.7, env: TOXENV=py27-dj19-grp }
- { python: 3.4, env: TOXENV=py34-dj19 }
- { python: 2.7, env: TOXENV=py27-dj110 }
- { python: 2.7, env: TOXENV=py27-dj110-grp }
- { python: 3.6, env: TOXENV=py36-dj110 }
- { python: 3.4, env: TOXENV=py34-dj110 }
- { python: 2.7, env: TOXENV=py27-dj111 }
- { python: 2.7, env: TOXENV=py27-dj111-grp }
- { python: 3.6, env: TOXENV=py36-dj111 }
- python: 3.6
env: TOXENV=py36-dj20 DATABASE_URL='postgres://[email protected]/nested_admin_test'
- { python: 3.6, env: TOXENV=py36-dj20 }
- { python: 3.6, env: TOXENV=py36-dj20-grp }
- { python: 3.6, env: TOXENV=py36-dj21 }
allow_failures:
- env: TOXENV=py36-dj20 DATABASE_URL='postgres://[email protected]/nested_admin_test'
- env: TOXENV=py36-dj21

cache:
pip: true
# directories:
# - node_modules
directories:
- node_modules
- bin

addons:
chrome: stable
Expand All @@ -36,10 +38,14 @@ before_script:
- if [ "$DATABASE_URL" == "postgres://[email protected]/nested_admin_test" ]; then psql -c "DROP DATABASE IF EXISTS nested_admin_test;" -U postgres; fi
- if [ "$DATABASE_URL" == "postgres://[email protected]/nested_admin_test" ]; then psql -c "create database nested_admin_test;" -U postgres; fi
- mkdir -p ~/bin
- wget -N http://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip -P ~/
- unzip ~/chromedriver_linux64.zip -d ~/bin
- rm ~/chromedriver_linux64.zip
- chmod +x ~/bin/chromedriver
- |
if [ ! -e ~/bin/chromedriver ]; then
export CHROMEDRIVER_VERSION=$(curl -q http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
wget -N http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip -P ~/
unzip ~/chromedriver_linux64.zip -d ~/bin
rm ~/chromedriver_linux64.zip
chmod +x ~/bin/chromedriver
fi
# before_install:
# - nvm install node
Expand All @@ -50,6 +56,10 @@ install:
- pip install tox

script:
- travis_retry travis_retry travis_retry tox -- --selenium=chrome-headless --failfast
- |
travis_retry travis_retry travis_retry tox -- \
--verbosity=3 \
--selenium=chrome-headless \
--failfast
sudo: false
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

**3.0.22b1 (unreleased)**

* Fixed: NestedTabularInline support in Django 2.0 (`#97`_)

.. _#97: https://github.com/theatlantic/django-nested-admin/issues/97

**3.0.21 (Nov 1, 2017)**

* Fixed: Bug when saving child models that use django-polymorphic
Expand Down
1 change: 1 addition & 0 deletions nested_admin/static/nested_admin/dist/nested_admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nested_admin/static/nested_admin/dist/nested_admin.css.map

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions nested_admin/static/nested_admin/dist/nested_admin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nested_admin/static/nested_admin/dist/nested_admin.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nested_admin/static/nested_admin/dist/nested_admin.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 110594e

Please sign in to comment.