New minor release 4.5.8

dirkroorda · Feb 5, 2016 · 4e2804f · 4e2804f
1 parent 98de519
commit 4e2804f
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 5 deletions.
diff --git a/dist/laf-fabric-4.5.7.tar.gz b/dist/laf-fabric-4.5.7.tar.gz
diff --git a/dist/laf-fabric-4.5.8.tar.gz b/dist/laf-fabric-4.5.8.tar.gz
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,7 @@
 project = u'LAF Fabric'
 copyright = u'2013, Dirk Roorda'
 version = '4.5'
-release = '4.5.7'
+release = '4.5.8'
 exclude_patterns = ['_build']
 add_function_parentheses = True
 add_module_names = False

diff --git a/docs/conf.py.bck b/docs/conf.py.bck
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath('../tasks'))
+
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.mathjax',
+    'sphinx.ext.ifconfig',
+    'sphinx.ext.viewcode',
+    'sphinx.ext.intersphinx',
+]
+
+intersphinx_mapping = {'python': ('http://docs.python.org/3.3', None)}
+
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'LAF Fabric'
+copyright = u'2013, Dirk Roorda'
+version = '4.5'
+release = '4.5.7'
+exclude_patterns = ['_build']
+add_function_parentheses = True
+add_module_names = False
+pygments_style = 'sphinx'
+autoclass_content = 'both'
+
+# -- Options for HTML output ----------------------------------------------
+
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+if on_rtd:
+    html_theme = 'default'
+else:
+    html_theme = 'sphinx_rtd_theme'
+html_theme_path = ["_themes", ]
+
+html_static_path = ['_static']
+html_domain_indices = True
+html_use_index = True
+html_split_index = False
+html_show_sourcelink = True
+html_show_sphinx = True
+html_show_copyright = True
+htmlhelp_basename = 'LAF Fabric'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+'papersize': 'a4paper',
+'pointsize': '10pt',
+}
+
+latex_documents = [
+  ('index', 'LAF_Fabric.tex', u'LAF Fabric Documentation',
+   u'Dirk Roorda', 'manual'),
+]
+
+# -- Options for manual page output ---------------------------------------
+
+man_pages = [
+    ('index', 'LAF_Fabric', u'LAF Fabric Documentation',
+     [u'Dirk Roorda'], 1)
+]
+
+# -- Options for Texinfo output -------------------------------------------
+
+texinfo_documents = [
+  ('index', 'LAF_Fabric', u'LAF Fabric Documentation',
+   u'Dirk Roorda', 'LAF Fabric', 'One line description of project_name.',
+   'Miscellaneous'),
+]
+
+# -- Options for Epub output ----------------------------------------------
+
+epub_title = u'LAF Fabric'
+epub_author = u'Dirk Roorda'
+epub_publisher = u'Dirk Roorda'
+epub_copyright = u'2013, Dirk Roorda'
+epub_basename = u'LAF_Fabric'
+epub_theme = 'epub'
+epub_show_urls = 'footnote'
+epub_use_index = True
diff --git a/docs/texts/release-notes.rst b/docs/texts/release-notes.rst
@@ -1,5 +1,13 @@
 Release Notes
 #############
+4.5.8
+==========
+The MQL API in the etcbc package now uses the ETCBC data plus the enrichments (x_etcbc4b).
+
+4.5.7
+==========
+Improvements in the documentation.
+
 4.5.6
 ==========
 Slightly better error messages if configuration files cannot be found or contain wrong values.

diff --git a/emdros2laf/settings.py b/emdros2laf/settings.py
@@ -7,7 +7,7 @@
 import argparse
 
 NAME = 'LAF-Fabric'
-VERSION = '4.5.7'
+VERSION = '4.5.8'
 APIREF = 'http://laf-fabric.readthedocs.org/en/latest/texts/API-reference.html'
 DEFAULT_DATA_DIR = 'laf-fabric-data'
 MAIN_CFG = 'laf-fabric.cfg'

diff --git a/etcbc/mql.py b/etcbc/mql.py
@@ -18,7 +18,7 @@ def __init__(self, API):
         global F
         global NN
         env = API['fabric'].lafapi.names.env
-        self.data_path = env['source_data']
+        self.data_path = env['source_xdata']
         self.parser = etree.XMLParser(remove_blank_text=True)
         NN = API['NN']
         F = API['F']

diff --git a/laf/settings.py b/laf/settings.py
@@ -3,7 +3,7 @@
 from .timestamp import Timestamp
 
 NAME = 'LAF-Fabric'
-VERSION = '4.5.7'
+VERSION = '4.5.8'
 APIREF = 'http://laf-fabric.readthedocs.org/en/latest/texts/API-reference.html'
 FEATDOC = 'https://shebanq.ancient-data.org/static/docs/featuredoc/texts/welcome.html'
 MAIN_CFG = 'laf-fabric.cfg'
@@ -42,6 +42,7 @@ class Settings(object):
         'data_dir':              '{data_dir}',
         'output_dir':            '{output_dir}',
         'source_data':           '{data_dir}/{source}/mql/{source}',
+        'source_xdata':          '{data_dir}/{source}/mql/x_{source}',
         'bin_dir':               '{data_dir}/{source}/{bin_subdir}',
         'm_source_dir':          '{m_source_dir}/{source}/{m_source_subdir}',
         'm_source_path':         '{m_source_dir}/{source}/{m_source_subdir}/{source}.txt.hdr',

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 setup(
     name='laf-fabric',
-    version='4.5.7',
+    version='4.5.8',
     author='Dirk Roorda',
     author_email='dirk.roorda@dans.knaw.nl',
     description='''Tools to read LAF resources (Linguistic Annotation Framework ISO 24612:2012) and analyse them efficiently.