Merge pull request #2 from EGA-archive/dev

Merging into master
EGA-archive · Oct 29, 2018 · 555ee08 · 555ee08
2 parents cae9289 + d3b45f5
commit 555ee08
Show file tree

Hide file tree

Showing 222 changed files with 5,459 additions and 10,896 deletions.
diff --git a/.filebeat.yml b/.filebeat.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -4,26 +4,17 @@
 tmp/
 private/
 
-# =====================================
+
 # Byte-compiled / optimized / DLL files
-# =====================================
 __pycache__/
 *.py[cod]
 *$py.class
 
-# =====================================
 # C extensions
-# =====================================
 *.so
-*.so.*
-*.o
-*.la
 
-# =====================================
 # Distribution / packaging
-# =====================================
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -35,55 +26,86 @@ lib64/
 parts/
 sdist/
 var/
+wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 
-# =====================================
 # PyInstaller
-# =====================================
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
-# =====================================
 # Installer logs
-# =====================================
 pip-log.txt
 pip-delete-this-directory.txt
 
-# =====================================
 # Unit test / coverage reports
-# =====================================
 htmlcov/
 .tox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
 .hypothesis/
-.pytest_cache
+.pytest_cache/
 
-# =====================================
 # Translations
-# =====================================
 *.mo
 *.pot
 
-# =====================================
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
 # PyBuilder
-# =====================================
 target/
 
-# =====================================
-# IPython Notebook
-# =====================================
+# Jupyter Notebook
 .ipynb_checkpoints
 
-# =====================================
 # pyenv
-# =====================================
 .python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
diff --git a/.snyk b/.snyk
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
diff --git a/LICENSE b/LICENSE
@@ -178,15 +178,15 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.