import glitch

annotation · Dec 14, 2018 · 9f638c0 · 9f638c0
1 parent 3de936c
commit 9f638c0
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -99,6 +99,6 @@ offers an easy and elegant way to do so.
 As an example, here I quote the 
 [*stitching* algorithm](https://archive.softwareheritage.org/swh:1:cnt:6169c074089ddc8a0e048cb67e1fec57857ef54d;lines=3224-3270/),
 by means of which Text-Fabric Search collects the solutions of a
-[search template](https://annotation.github.io/text-fabric/Api/General/#searching).
+[search template](https://annotation.github.io/text-fabric/Use/Search/).
 The quote refers directly to specific lines of code, deeply buried in
 a Python file within a particular version of Text-Fabric.**
diff --git a/build.py b/build.py
@@ -251,15 +251,6 @@ def codestats():
 
 
 def tfbrowse(dataset, remaining):
-  datadir = f'{APP_BASE}/{dataset}'
-  good = True
-  try:
-    os.chdir(datadir)
-  except Exception:
-    good = False
-    console(f'Cannot find TF app directory "{datadir}"')
-  if not good:
-    return
   rargs = ' '.join(remaining)
   cmdLine = f'text-fabric {dataset} {rargs}'
   try:

diff --git a/dist/text-fabric-7.3.0.tar.gz b/dist/text-fabric-7.3.0.tar.gz
diff --git a/dist/text-fabric-7.3.1.tar.gz b/dist/text-fabric-7.3.1.tar.gz
diff --git a/docs/About/News.md b/docs/About/News.md
@@ -12,6 +12,17 @@
 
 See the [issue list on GitHub]({{ghissues}})
 
+## 7.3.1
+
+2018-12-14
+
+Glitch in the Uruk app: it imports other modules, but because of the 
+dynamic way it is imported itself, a trick is needed to
+let it import its submodules correctly.
+
+
+2018-12-13
+
 ## 7.3
 
 2018-12-13

diff --git a/docs/Code/Stats.md b/docs/Code/Stats.md
@@ -1,14 +1,14 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=1.08 s (105.4 files/s, 25748.6 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.99 s (115.0 files/s, 28096.4 lines/s)
 --- | ---
 
 Language|files|blank|comment|code
 :-------|-------:|-------:|-------:|-------:
-Python|46|1558|883|9365
-Markdown|55|2664|0|7231
+Python|46|1558|883|9362
+Markdown|55|2669|0|7236
 CSS|6|1341|34|3289
 JavaScript|2|59|37|670
 HTML|2|5|0|480
 YAML|1|9|0|224
 Bourne Shell|2|1|0|4
 --------|--------|--------|--------|--------
-SUM:|114|5637|954|21263
+SUM:|114|5642|954|21265
diff --git a/docs/Code/StatsApplib.md b/docs/Code/StatsApplib.md
@@ -1,8 +1,8 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.04 s (336.6 files/s, 64557.3 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.04 s (317.2 files/s, 60970.6 lines/s)
 --- | ---
 
 Language|files|blank|comment|code
 :-------|-------:|-------:|-------:|-------:
-Python|14|376|212|2097
+Python|14|376|212|2103
 --------|--------|--------|--------|--------
-SUM:|14|376|212|2097
+SUM:|14|376|212|2103
diff --git a/docs/Code/StatsConvert.md b/docs/Code/StatsConvert.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.02 s (127.9 files/s, 41311.9 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.02 s (121.8 files/s, 39325.4 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/docs/Code/StatsCore.md b/docs/Code/StatsCore.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.03 s (257.0 files/s, 54456.0 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.03 s (260.3 files/s, 55143.7 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/docs/Code/StatsSearch.md b/docs/Code/StatsSearch.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.05 s (193.7 files/s, 76850.3 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.05 s (194.8 files/s, 77271.1 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/docs/Code/StatsServer.md b/docs/Code/StatsServer.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.06 s (328.1 files/s, 132742.7 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.06 s (313.1 files/s, 126659.7 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/docs/Code/StatsTest.md b/docs/Code/StatsTest.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.02 s (80.1 files/s, 53542.1 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.03 s (78.0 files/s, 52157.2 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/docs/Code/StatsToplevel.md b/docs/Code/StatsToplevel.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.02 s (267.7 files/s, 29284.4 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.02 s (274.5 files/s, 30025.2 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/docs/Code/StatsWriting.md b/docs/Code/StatsWriting.md
@@ -1,4 +1,4 @@
-cloc|github.com/AlDanial/cloc v 1.78  T=0.01 s (144.6 files/s, 34495.1 lines/s)
+cloc|github.com/AlDanial/cloc v 1.78  T=0.02 s (131.9 files/s, 31468.7 lines/s)
 --- | ---
 
 Language|files|blank|comment|code

diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
             'text-fabric-zip = tf.applib.zipdata:main',
         ]
     },
-    version='7.3.0',
+    version='7.3.1',
     description='''Processor and browser for Text Fabric Data''',
     author='Dirk Roorda',
     author_email='[email protected]',

diff --git a/test/avro/avro.ipynb b/test/avro/avro.ipynb
@@ -88,7 +88,7 @@
      "output_type": "stream",
      "text": [
       "This is Text-Fabric 5.5.22\n",
-      "Api reference : https://annotation.github.io/text-fabric/Api/General/\n",
+      "Api reference : https://annotation.github.io/text-fabric/Api/Fabric/\n",
       "Tutorial      : https://github.com/annotation/text-fabric/blob/master/docs/tutorial.ipynb\n",
       "Example data  : https://github.com/annotation/text-fabric-data\n",
       "\n",
@@ -131,7 +131,7 @@
      "output_type": "stream",
      "text": [
       "This is Text-Fabric 5.5.22\n",
-      "Api reference : https://annotation.github.io/text-fabric/Api/General/\n",
+      "Api reference : https://annotation.github.io/text-fabric/Api/Fabric/\n",
       "Tutorial      : https://github.com/annotation/text-fabric/blob/master/docs/tutorial.ipynb\n",
       "Example data  : https://github.com/annotation/text-fabric-data\n",
       "\n",

diff --git a/test/joblib/joblib.ipynb b/test/joblib/joblib.ipynb
@@ -102,7 +102,7 @@
      "output_type": "stream",
      "text": [
       "This is Text-Fabric 5.5.22\n",
-      "Api reference : https://annotation.github.io/text-fabric/Api/General/\n",
+      "Api reference : https://annotation.github.io/text-fabric/Api/Fabric/\n",
       "Tutorial      : https://github.com/annotation/text-fabric/blob/master/docs/tutorial.ipynb\n",
       "Example data  : https://github.com/annotation/text-fabric-data\n",
       "\n",
@@ -141,7 +141,7 @@
      "output_type": "stream",
      "text": [
       "This is Text-Fabric 5.5.22\n",
-      "Api reference : https://annotation.github.io/text-fabric/Api/General/\n",
+      "Api reference : https://annotation.github.io/text-fabric/Api/Fabric/\n",
       "Tutorial      : https://github.com/annotation/text-fabric/blob/master/docs/tutorial.ipynb\n",
       "Example data  : https://github.com/annotation/text-fabric-data\n",
       "\n",

diff --git a/test/marshal/marshal.ipynb b/test/marshal/marshal.ipynb
@@ -98,7 +98,7 @@
      "output_type": "stream",
      "text": [
       "This is Text-Fabric 5.5.22\n",
-      "Api reference : https://annotation.github.io/text-fabric/Api/General/\n",
+      "Api reference : https://annotation.github.io/text-fabric/Api/Fabric/\n",
       "Tutorial      : https://github.com/annotation/text-fabric/blob/master/docs/tutorial.ipynb\n",
       "Example data  : https://github.com/annotation/text-fabric-data\n",
       "\n",
@@ -137,7 +137,7 @@
      "output_type": "stream",
      "text": [
       "This is Text-Fabric 5.5.22\n",
-      "Api reference : https://annotation.github.io/text-fabric/Api/General/\n",
+      "Api reference : https://annotation.github.io/text-fabric/Api/Fabric/\n",
       "Tutorial      : https://github.com/annotation/text-fabric/blob/master/docs/tutorial.ipynb\n",
       "Example data  : https://github.com/annotation/text-fabric-data\n",
       "\n",

diff --git a/text_fabric.egg-info/PKG-INFO b/text_fabric.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: text-fabric
-Version: 7.3.0
+Version: 7.3.1
 Summary: Processor and browser for Text Fabric Data
 Home-page: https://github.com/annotation/text-fabric
 Author: Dirk Roorda

diff --git a/tf/applib/app.py b/tf/applib/app.py
@@ -1,3 +1,4 @@
+import sys
 import os
 import io
 from shutil import rmtree
@@ -171,12 +172,17 @@ def findAppConfig(dataSource, appDir):
 
 def findAppClass(dataSource, appDir):
   appClass = None
-  appPath = f'{appDir}/app.py'
+  moduleName = f'tf.apps.{dataSource}.app'
 
   try:
-    spec = util.spec_from_file_location(f'tf.apps.{dataSource}.app', appPath)
+    spec = util.spec_from_file_location(
+        moduleName,
+        f'{appDir}/app.py',
+    )
     code = util.module_from_spec(spec)
+    sys.path.insert(0, appDir)
     spec.loader.exec_module(code)
+    sys.path.pop(0)
     appClass = code.TfApp
   except Exception as e:
     console(f'findAppClass: {str(e)}', error=True)

diff --git a/tf/applib/links.py b/tf/applib/links.py
@@ -39,7 +39,7 @@ def linksApi(app, appName, silent):
   )
   appLink = outLink(f'{appName} API', extraUrl, f'{appName} API documentation')
   tfLink = outLink(
-      f'Text-Fabric API {api.TF.version}', f'{URL_TFDOC}/Api/General/', 'text-fabric-api'
+      f'Text-Fabric API {api.TF.version}', f'{URL_TFDOC}/Api/Fabric/', 'text-fabric-api'
   )
   tfsLink = outLink(
       'Search Reference', f'{URL_TFDOC}/Use/Search/',

diff --git a/tf/parameters.py b/tf/parameters.py
@@ -2,7 +2,7 @@
 from zipfile import ZIP_DEFLATED
 
 
-VERSION = '7.3.0'
+VERSION = '7.3.1'
 NAME = 'Text-Fabric'
 
 ORG = 'annotation'