Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ajbeach2/drf-elasticsearch-dsl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1.0
Choose a base ref
...
head repository: ajbeach2/drf-elasticsearch-dsl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Dec 25, 2017

  1. Update README.rst

    ajbeach2 authored Dec 25, 2017
    Copy the full SHA
    12ddefc View commit details
  2. Update README.rst

    ajbeach2 authored Dec 25, 2017
    Copy the full SHA
    f69d22e View commit details

Commits on Dec 26, 2017

  1. Copy the full SHA
    26e0db6 View commit details
  2. Copy the full SHA
    b800b7e View commit details
  3. update to 0.1.1

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    4ca3ff7 View commit details
  4. fix history rst warning

    Alexander Beach authored and Alexander Beach committed Dec 26, 2017
    Copy the full SHA
    d4f25b1 View commit details
  5. Copy the full SHA
    b2f381d View commit details
  6. history

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    02a2001 View commit details
  7. Copy the full SHA
    e04c799 View commit details
  8. update tag behavior

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    f7d7948 View commit details
  9. Copy the full SHA
    6a24481 View commit details
  10. Copy the full SHA
    08922db View commit details
  11. Copy the full SHA
    a9e0346 View commit details
  12. udpate sphinx config

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    f84f196 View commit details
  13. docs config

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    df1f6da View commit details
  14. docs config

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    b5f450d View commit details
  15. settings

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    621b251 View commit details
  16. settings

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    866ea82 View commit details
  17. settings

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    e8c3301 View commit details
  18. update readme

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    12a32ed View commit details
  19. update readme

    ajbeach2 committed Dec 26, 2017
    Copy the full SHA
    fb704d8 View commit details
  20. Copy the full SHA
    72a0555 View commit details

Commits on Mar 5, 2018

  1. Update README.rst

    spelling
    ajbeach2 authored Mar 5, 2018
    Copy the full SHA
    2b55a29 View commit details
Showing with 62 additions and 29 deletions.
  1. +0 −7 HISTORY.rst
  2. +3 −5 README.rst
  3. +3 −2 docs/conf.py
  4. +1 −1 docs/index.rst
  5. +41 −0 docs/settings.py
  6. +1 −1 drf_elasticsearch_dsl/__init__.py
  7. +11 −11 setup.cfg
  8. +2 −2 setup.py
7 changes: 0 additions & 7 deletions HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
.. :changelog:
History
-------

0.1.0 (2017-11-18)
++++++++++++++++++

* First release on PyPI.
8 changes: 3 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DRF Elasticsearch DSL
:target: https://codecov.io/gh/ajbeach2/drf-elasticsearch-dsl

DRF Elasticsearch DSL is losely based on `django-haystack`_ and provides a ``ModelSerializerDocument``
which supports all of the field types provided by `elastic-search-dsl persistence`_.. ``ModelSerializerDocument`` is losely based of of the ``DocType`` class provided by ``elasticsearch-dsl.py``
which supports all of the field types provided by `elastic-search-dsl persistence`_.. ``ModelSerializerDocument`` is losely based on the ``DocType`` class provided by ``elasticsearch-dsl.py``

The purpose of this libraray is to allow definition of elasticsearch documents with DRF's `ModelSerializer`_ class while optionally providing support for async document updates and deletes with `celery`_.

@@ -81,8 +81,6 @@ Create a ModelSerializer
Create a ``search_indexes.py``, which should be in the root of the application. Add your ``ModelSerializerDocument`` classes here. The specificed index will have its mapping updated for this document.

Note: Elasticsearch has removed support for mapping types.


.. code-block:: python
@@ -115,9 +113,9 @@ Features
--------

Celery Support
==============
^^^^^^^^^^^^^^^

By default, dr-elasticsearch-dsl does not setup signals to sync models on save or delete. To enable celery support, add the following to your settings.py confiration:
By default, dr-elasticsearch-dsl does not setup signals to sync models on save or delete. To enable celery support, add the following to your settings.py configuration:

.. code-block:: python
5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -16,7 +16,8 @@
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))

sys.path.insert(0, os.path.abspath('.'))

cwd = os.getcwd()
parent = os.path.dirname(cwd)
@@ -25,7 +26,7 @@
import drf_elasticsearch_dsl
import django

os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
django.setup()

# -- General configuration -----------------------------------------------------
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Welcome to Django Package's documentation!
Welcome to DRF Elastsearch DSL's documentation!
=================================================================

Contents:
41 changes: 41 additions & 0 deletions docs/settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# -*- coding: utf-8
from __future__ import unicode_literals, absolute_import
import os
import django
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

DEBUG = True
USE_TZ = True

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = "mbb7o9l^03*a^5-b)0*y%8v*=p#p@wh+589i1n3-(@h-e7fz#4"

DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
'NAME': os.path.join(BASE_DIR, 'test_db.sqlite3'),
}
}

ROOT_URLCONF = "tests.urls"

INSTALLED_APPS = [
"django.contrib.auth",
"django.contrib.contenttypes",
"django.contrib.sites",
"drf_elasticsearch_dsl",


"tests"
]

DRF_SERIALIZER_ELASTICSERACH_SETTTINGS = {
'elasticsearch_hosts': ['localhost'],
}

SITE_ID = 1

if django.VERSION >= (1, 10):
MIDDLEWARE = ()
else:
MIDDLEWARE_CLASSES = ()
2 changes: 1 addition & 1 deletion drf_elasticsearch_dsl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '0.1.0'
__version__ = '0.1.5'

default_app_config = 'drf_elasticsearch_dsl.apps.DrfElasticsearchDsl'
22 changes: 11 additions & 11 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[bumpversion]
current_version = 0.1.0
current_version = 0.1.5
commit = True
tag = True

[bumpversion:file:setup.py]
tag_name = {new_version}

[bumpversion:file:drf_elasticsearch_dsl/__init__.py]

[wheel]
universal = 1

[aliases]
test=pytest
test = pytest

[flake8]
ignore = D203
exclude =
drf_elasticsearch_dsl/migrations,
.git,
.tox,
docs/conf.py,
build,
dist
exclude =
drf_elasticsearch_dsl/migrations,
.git,
.tox,
docs/conf.py,
build,
dist
max-line-length = 119

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ def get_version(*file_paths):
name='drf-elasticsearch-dsl',
version=version,
description="""DRF wrapper around ElasticsearchDSL""",
long_description=readme + '\n\n' + history,
long_description=readme,
author='Alexander Beach',
author_email='ajbeach2@gmail.com',
url='https://github.com/ajbeach2/drf-elasticsearch-dsl',
@@ -91,7 +91,7 @@ def get_version(*file_paths):
'Framework :: Django :: 2.0',
'Environment :: Web Environment',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',