Deleted old ELK dockerfiles and updated version number to 0.0.5 until…

… release is confirmed
apache · Jun 22, 2017 · 2a8d3e7237d19558ecce9630c6b67671e6e2cff8 · 2a8d3e7
1 parent 6b9c21a
commit 2a8d3e7237d19558ecce9630c6b67671e6e2cff8
Showing 20 changed files with 132 additions and 770 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -18,8 +18,6 @@
 LICENSE
 NOTICE
 env
-userale
-es
 docs
 doc_requirements.txt
 docker

diff --git a/.gitignore b/.gitignore
@@ -26,10 +26,6 @@ setup_tools
 # Flask instance folder
 instance/
 
-# Docker stuff
-es/
-userale/
-
 # Scrapy stuff:
 .scrapy
 
@@ -49,7 +45,7 @@ coverage.xml
 
 # Distribution / packaging
 .Python
-env/
+env*/
 build/
 develop-eggs/
 dist/

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -21,29 +21,35 @@
 Changelog
 =========
 
-0.1.3 (2016-09-19)
+0.0.5 (2017-06-30)
+------------------
+* Updated elasticsearch-dsl to 5.4.1
+* Removed all support for UserALE 3.0
+* General cleanup
+
+0.0.4 (2016-09-19)
 ------------------
 * Moved to Apache.
 * Updated all documentation.
 * Added License headers
 * Docker compose file added to assist deployment of ELK stack with Distill
 
-0.1.2 (2016-07-22)
+0.0.3 (2016-07-22)
 ------------------
 * Moved CRUD operations from UserAle model to Brew model.
 * Added API specs to segment UserAle data from Elasticsearch
 * Added deployment instructions 
 
-0.1.1 (2016-06-14)
+0.0.2 (2016-06-14)
 ------------------
 
 * Completed index route for status endpoint which lists all applications registered and their document count segmented by type.
 * Updated setup.py to reference deploy scripts
-* Example configuration to deploy Distll with Gunicorn and Nginx for Linux/Mac users
+* Example configuration to deploy Distill with Gunicorn and Nginx for Linux/Mac users
 * Added UserAle and Stout classes.
 * Updated requirements.txt for deployment.
 
-0.1.0 (2016-04-01)
+0.0.1 (2016-04-01)
 ------------------
 
-Initial release.
+Initial alpha release.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,12 @@
 include MANIFEST.in
+include README.md
+include CHANGELOG.md
+include LICENSE.txt
 include setup.py
-include README.txt 
-include CHANGELOG.txt 
-include LICENSE.txt
+
+# Include all sources
+graft distill
+
+# Exclude
+global-exclude *.py[co]
+global-exclude __pycache__
diff --git a/distill/version.py b/distill/version.py
@@ -19,4 +19,4 @@
 and parsed by ``setup.py``.
 """
 
-__version__ = "0.1.4"
+__version__ = "0.0.5"
diff --git a/doc_requirements.txt b/doc_requirements.txt
diff --git a/Dockerfile → docker/distill/Dockerfile b/Dockerfile → docker/distill/Dockerfile
diff --git a/docker/es/Dockerfile b/docker/es/Dockerfile
diff --git a/docker/es/elasticsearch.yml b/docker/es/elasticsearch.yml
diff --git a/docker/es/logging.yml b/docker/es/logging.yml