Repository: pypi/warehouse

Issue:
Update elasticsearch-dsl to 6.1.0

There's a new version of [elasticsearch-dsl](https://pypi.python.org/pypi/elasticsearch-dsl) available.
You are currently using **5.4.0**. I have updated it to **6.1.0**



These links might come in handy:  <a href="https://pypi.python.org/pypi/elasticsearch-dsl">PyPI</a> | <a href="https://pyup.io/changelogs/elasticsearch-dsl/">Changelog</a> | <a href="https://github.com/elasticsearch/elasticsearch-dsl-py">Repo</a> 



### Changelog
> 
>### 6.1.0

>------------------

>* Removed ``String`` field.
>* Fixed issue with ``Object``/``Nested`` deserialization



>### 6.0.1

>------------------

>Fixing wheel package for Python 2.7 (803)



>### 6.0.0

>------------------

>Backwards incompatible release compatible with elasticsearch 6.0, changes
>include:

> * use ``doc`` as default ``DocType`` name, this change includes:
>   * ``DocType._doc_type.matches`` method is now used to determine which
>   ``DocType`` should be used for a hit instead of just checking ``_type``
> * ``Nested`` and ``Object`` field refactoring using newly introduced
>   ``InnerDoc`` class. To define a ``Nested``/``Object`` field just define the
>   ``InnerDoc`` subclass and then use it when defining the field::

>      class Comment(InnerDoc):
>          body = Text()
>          created_at = Date()

>      class Blog(DocType):
>          comments = Nested(Comment)

> * methods on ``connections`` singleton are now exposed on the ``connections``
>   module directly.
> * field values are now only deserialized when coming from elasticsearch (via
>   ``from_es`` method) and not when assigning values in python (either by
>   direct assignment or in ``__init__``).







*Got merge conflicts? Close this PR and delete the branch. I'll create a new PR for you.*

Happy merging! 🤖

Update elasticsearch to 6.2.0

This PR updates [elasticsearch](https://pypi.python.org/pypi/elasticsearch) from **5.4.0** to **6.2.0**.



<details>
  <summary>Changelog</summary>
  
  
   ### 6.2.0
   ```
   -----------
  * Adding Gzip support for capacity constrained networks
  * ``_routing`` in bulk action has been deprecated in ES. Introduces a breaking change
    if you use ``routing`` as a field in your documents.
   ```
   
  
  
   ### 6.1.1
   ```
   ------------------

 * Updates to SSLContext logic to make it easier to use and have saner defaults.
 * Doc updates
   ```
   
  
  
   ### 6.1.0
   ```
   ------------------

  * bad release
   ```
   
  
  
   ### 6.0.0
   ```
   ------------------

 * compatibility with Elasticsearch 6.0.0
   ```
   
  
  
   ### 5.6.4
   ```
   * fix handling of UTF-8 surrogates
   ```
   
  
  
   ### 5.5.0
   ```
   ------------------

 * ``streaming_bulk`` helper now supports retries with incremental backoff
 * ``scan`` helper properly checks for successful shards instead of just
   checking ``failed``
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.python.org/pypi/elasticsearch
  - Changelog: https://pyup.io/changelogs/elasticsearch/
  - Repo: https://github.com/elastic/elasticsearch-py
</details>




Discussion:

Resolving patch:
diff --git a/warehouse/config.py b/warehouse/config.py
--- a/warehouse/config.py
+++ b/warehouse/config.py
@@ -198,6 +198,7 @@ def configure(settings=None):
     maybe_set(settings, "celery.scheduler_url", "REDIS_URL")
     maybe_set(settings, "database.url", "DATABASE_URL")
     maybe_set(settings, "elasticsearch.url", "ELASTICSEARCH_URL")
+    maybe_set(settings, "elasticsearch.url", "ELASTICSEARCH_SIX_URL")
     maybe_set(settings, "sentry.dsn", "SENTRY_DSN")
     maybe_set(settings, "sentry.transport", "SENTRY_TRANSPORT")
     maybe_set(settings, "sessions.url", "REDIS_URL")


Test patch:
diff --git a/tests/unit/search/test_tasks.py b/tests/unit/search/test_tasks.py
--- a/tests/unit/search/test_tasks.py
+++ b/tests/unit/search/test_tasks.py
@@ -38,7 +38,7 @@ def test_project_docs(db_session):
     assert list(_project_docs(db_session)) == [
         {
             "_id": p.normalized_name,
-            "_type": "project",
+            "_type": "doc",
             "_source": {
                 "created": p.created,
                 "name": p.name,