Merge branch 'master' of https://github.com/impresso/impresso-text-ac…

…quisition
impresso · Aug 12, 2019 · 9733c55 · 9733c55
2 parents ec6543c + 923699b
commit 9733c55
Show file tree

Hide file tree

Showing 574 changed files with 140,887 additions and 523 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ text_importer/data/temp/
 .ipynb_checkpoints/
 text_importer/data/cahier-de-charges-mets-alto2016
 dask-worker-space/
+worker-*
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "text_importer/impresso-schemas"]
+	path = text_importer/impresso-schemas
+	url = https://github.com/impresso/impresso-schemas.git
+        branch = schemas-update
diff --git a/Pipfile b/Pipfile
@@ -13,9 +13,8 @@ python-jsonschema-objects = "*"
 jsonlines = "*"
 boto = "*"
 "boto3" = "*"
-impresso_commons = {git = "https://github.com/impresso/impresso-pycommons.git",editable = true}
+impresso-commons = {git = "https://github.com/impresso/impresso-pycommons.git",editable = true}
 e1839a8 = {editable = true,path = "."}
-tornado = "~=6.0"
 
 [dev-packages]
 pytest = "*"
@@ -26,6 +25,7 @@ jupyter = "*"
 "flake8" = "*"
 isort = "*"
 tox = "*"
+bokeh = "*"
 
 [requires]
 python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/notebooks/import_lux_data.ipynb b/notebooks/import_lux_data.ipynb