Merge branch 'release/v1.0.1'

CentreForCorpusResearch · Jan 20, 2015 · 84eb607 · 84eb607
2 parents bca9a5d + 985fae3
commit 84eb607
Show file tree

Hide file tree

Showing 1,699 changed files with 590,642 additions and 902 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,14 +4,16 @@
 *Store*.bdb
 *.data
 *.data_*
+indexes_OLD
+stores_OLD
 
 # Python compiled/optimized files
 *.py[co]
 
 # Python packaging/distribution
 *.egg
 *.egg-info
-dist
+#dist
 build
 eggs
 parts
@@ -32,3 +34,13 @@ PyZ3950_parsetab.*
 
 # O/S file buffers
 *~
+
+# Database config file template 
+/dbs/dickens/config.xml
+
+# Log files
+/dbs/dickens/logs/*.log
+
+#phpstorm
+
+.idea
diff --git a/clic/__init__.py b/clic/__init__.py
@@ -1,2 +1,5 @@
-__all__ = ['dickens', 'stats']
+"""Corpus Linguistics in Cheshire3 (CLiC)."""
 
+__name__ = "clic"
+__package__ = "clic"
+__all__ = ['deploy', 'dickens', 'setuptools', 'stats']
diff --git a/clic/deploy/__init__.py b/clic/deploy/__init__.py
@@ -0,0 +1,3 @@
+"""CLiC Deployment."""
+
+__all__ = ['utils']
diff --git a/clic/deploy/utils.py b/clic/deploy/utils.py
diff --git a/clic/dickens/__init__.py b/clic/dickens/__init__.py