Skip to content

Commit

Permalink
Merge pull request #258 from uncovertruth/fix/missing_sqlite3_package
Browse files Browse the repository at this point in the history
Travis's ppa for sqlite3 is removed
  • Loading branch information
hirokinko authored Nov 8, 2018
2 parents 3f0500e + 1fc6ef2 commit 2c7840c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ cache:
pip: true
directories:
- $TRAVIS_BUILD_DIR/.tox
addons:
apt:
sources:
- travis-ci/sqlite3
packages:
- sqlite3
env:
global:
- secure: u0BkKcx3XkU+fi+Hf+Lmp+BMntW/QYme4GRrwKVQh1Blfunz6FIYxcNJDRwvrccGgj9BtUVg5O1Il7Hxo/k0OGb1glJni3G5C98qRroX5qG3jk+ptWLSYadE82CRUEB72UMKcuDq2lu+R6ACEQ/EQzLhVkX8GuFQ7/W6QRzbf6LN/OfOuz2OiZH/7WPxKk73EKQZtvslEqTI6zB0+RRjCt1ObHeZ4etYzRblO+gcVfeN1ySPeS5oyC8PwxjHMhpYMcMQLDjmqUU/ARQfDgAQVOyVKb7j/INmesWSRoBUWjkkeTiE9Wtx4MdAQ1bLnIhWOyDk5PXGDcK2SEOq2BMP0mScfqKzqUDQ2VGpVGR6ukBvkvN9OjZXR0TDx/ryrLgAG+z4pvzzN/XJbyVSGkH4tK2X8mua5kisb25OBEuMNDLRhubrHfWpTgWuYCNSPGQR2iE/LKRbDqWj5svMdbYmhBxV1/eLDga0KZo4PStyKfzJHYm/Qz7TfwgxMYV0WXofZmIi4LtX7j0LyEho62PwAPm8aiYfRFxXXtd5UFEEVZGSHXDUL5y4sILARzQmrIL4ZP9z52fxeBePpY6i8Otuov0GjtLifg0FjBGo5N7D1ANT00wKlbJCARstNtIElN/11dILdJE2y1KJeYiZI1SfoRUJk0TdJjgji5MIz6IHTQ0=
Expand Down Expand Up @@ -57,7 +51,7 @@ matrix:
- env: TOX_ENV=py37-djmaster
sudo: true # TODO Remove when supported
dist: xenial
python: 3.6
python: 3.7
- env: TOX_ENV=flake8
python: 3.6
- env: TOX_ENV=isort
Expand All @@ -69,6 +63,7 @@ matrix:
allow_failures:
- env: TOX_ENV=py35-djmaster
- env: TOX_ENV=py36-djmaster
- env: TOX_ENV=py37-djmaster
# Use old sqlite3 that does not support shared memory
- env: TOX_ENV=py27-dj111
- env: TOX_ENV=pypy-dj111
Expand Down
5 changes: 3 additions & 2 deletions horizon/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ def _set_horizontal_key_from_params(self, kwargs):
lookup_value = kwargs.get(key_field.attname, None) or kwargs.get(key_field.name, None)
self._horizontal_key = self._get_horizontal_key_from_lookup_value(lookup_value)

def _create_object_from_params(self, lookup, params):
def _create_object_from_params(self, lookup, *args, **kwargs):
self._set_horizontal_key_from_params(lookup)
return super(HorizontalQuerySetMixin, self)._create_object_from_params(lookup, params)
return super(HorizontalQuerySetMixin, self)._create_object_from_params(
lookup, *args, **kwargs)

def _extract_model_params(self, defaults, **kwargs):
self._set_horizontal_key_from_params(kwargs)
Expand Down

0 comments on commit 2c7840c

Please sign in to comment.