Skip to content

Commit

Permalink
move house
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkroorda committed Dec 13, 2018
1 parent 751ee86 commit 813f578
Show file tree
Hide file tree
Showing 63 changed files with 354 additions and 3,133 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This works really well in Jupyter notebooks.

Text Fabric is a Python(3) package on the Python Package Index, so you can install it easily with `pip` from
the command line. Here are the precise
[installation instructions](https://dans-labs.github.io/text-fabric/).
[installation instructions](https://annotation.github.io/text-fabric/).

# Use

Expand Down Expand Up @@ -65,7 +65,7 @@ There you'll find links to further help.
There is extensive documentation.
If you start using the Text-Fabric API in your programs, you'll need it.

Jump off to the [docs](https://dans-labs.github.io/text-fabric/)
Jump off to the [docs](https://annotation.github.io/text-fabric/)

# Data

Expand All @@ -90,7 +90,7 @@ An app takes care of automatic downloading of the dataset and it supports the Te

---

<a target="_blank" href="https://archive.softwareheritage.org/browse/origin/https://github.com/Dans-labs/text-fabric/directory/"><img src="/docs/images/swh-logo-archive.png" width="100" align="left"/></a>
<a target="_blank" href="https://archive.softwareheritage.org/browse/origin/https://github.com/annotation/text-fabric/directory/"><img src="/docs/images/swh-logo-archive.png" width="100" align="left"/></a>

**This repository is being archived continuously by the
[Software Heritage Archive](https://archive.softwareheritage.org).
Expand Down
2 changes: 1 addition & 1 deletion apps/bhsa/bhsa-Medina.tfjob
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"searchTemplate": "clause\n =: word lex=>CR\n phrase function=Adju|Cmpl|Loca|Supp|Time|Modi\n phrase\n word vt=perf|impf\n phrase function=Objc\n", "tuples": "", "sections": "", "side": "export", "help": "", "author": "Dirk Roorda", "title": "An MQL query by Robert Medina", "description": "Robert Medina and Oliver Glanz developed an MQL query:\n\n```\nselect all objects where\n[clause\n [word FOCUS FIRST lex = \">CR\"]\n [UnorderedGroup\n [phrase FOCUS function IN (Adju, Cmpl, Loca, Supp, Time, Modi)]\n [phrase \n [word FOCUS vt IN (perf, impf)]\n ]\n [phrase FOCUS function = Objc]\n ]\n]\n```\n\nThe translation in TF-search is here.\n\nA little explanation:\n\nThe `=:` between the `clause` and the `word` means that they start at the same word.\n\nEmbedding is indicated by indentation.\n\nOrder is not significant. So the three phrases correspond to an *unordered group* in MQL. \n\nIf you want, you can express order by putting in [relational operators](https://dans-labs.github.io/text-fabric/Api/General/#relational-operators) such as `=:`.", "withNodes": "on", "condensed": "on", "condensetp": "clause", "textformat": "text-orig-full", "expandAll": "1", "linked": 1, "opened": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20", "position": 1, "batch": 20}
{"searchTemplate": "clause\n =: word lex=>CR\n phrase function=Adju|Cmpl|Loca|Supp|Time|Modi\n phrase\n word vt=perf|impf\n phrase function=Objc\n", "tuples": "", "sections": "", "side": "export", "help": "", "author": "Dirk Roorda", "title": "An MQL query by Robert Medina", "description": "Robert Medina and Oliver Glanz developed an MQL query:\n\n```\nselect all objects where\n[clause\n [word FOCUS FIRST lex = \">CR\"]\n [UnorderedGroup\n [phrase FOCUS function IN (Adju, Cmpl, Loca, Supp, Time, Modi)]\n [phrase \n [word FOCUS vt IN (perf, impf)]\n ]\n [phrase FOCUS function = Objc]\n ]\n]\n```\n\nThe translation in TF-search is here.\n\nA little explanation:\n\nThe `=:` between the `clause` and the `word` means that they start at the same word.\n\nEmbedding is indicated by indentation.\n\nOrder is not significant. So the three phrases correspond to an *unordered group* in MQL. \n\nIf you want, you can express order by putting in [relational operators](https://annotation.github.io/text-fabric/Api/General/#relational-operators) such as `=:`.", "withNodes": "on", "condensed": "on", "condensetp": "clause", "textformat": "text-orig-full", "expandAll": "1", "linked": 1, "opened": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20", "position": 1, "batch": 20}
9 changes: 6 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import psutil

from tf.core.helpers import console
from tf.applib.helpers import findAppConfig
from tf.applib.app import findApp, findAppConfig
from tf.applib.zipdata import zipData

HELP = '''
Expand Down Expand Up @@ -57,7 +57,7 @@
),
)

TF_BASE = os.path.expanduser('~/github/Dans-labs/text-fabric')
TF_BASE = os.path.expanduser('~/github/annotation/text-fabric')
TEST_BASE = f'{TF_BASE}/test'
APP_BASE = f'{TF_BASE}/apps'
PACKAGE = 'text-fabric'
Expand Down Expand Up @@ -163,7 +163,10 @@ def shipDocs():


def shipData(app, remaining):
config = findAppConfig(app)
(commit, appDir) = findApp(app, False, False)
if not appDir:
console('Data not shipped')
config = findAppConfig(app, appDir)
if not config:
console('Data not shipped')
return
Expand Down
12 changes: 6 additions & 6 deletions docs/Code/Stats.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
cloc|github.com/AlDanial/cloc v 1.78 T=1.46 s (90.3 files/s, 21704.3 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.51 s (236.6 files/s, 57587.6 lines/s)
--- | ---

Language|files|blank|comment|code
:-------|-------:|-------:|-------:|-------:
Python|55|1782|952|10983
Markdown|59|2780|0|7567
CSS|10|1343|34|3993
Python|46|1545|859|9274
Markdown|59|2780|0|7568
CSS|6|1341|34|3289
HTML|4|32|0|928
IPython Notebook|1|0|0|797
JavaScript|2|59|37|670
HTML|2|5|0|480
YAML|1|9|0|228
Bourne Shell|2|1|0|4
--------|--------|--------|--------|--------
SUM:|132|5979|1023|24722
SUM:|121|5767|930|22758
6 changes: 3 additions & 3 deletions docs/Code/StatsApplib.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.04 s (340.6 files/s, 63765.6 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.04 s (351.6 files/s, 64622.0 lines/s)
--- | ---

Language|files|blank|comment|code
:-------|-------:|-------:|-------:|-------:
Python|13|351|165|1918
Python|14|365|188|2020
--------|--------|--------|--------|--------
SUM:|13|351|165|1918
SUM:|14|365|188|2020
2 changes: 1 addition & 1 deletion docs/Code/StatsConvert.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.01 s (133.9 files/s, 43263.0 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.01 s (133.4 files/s, 43083.5 lines/s)
--- | ---

Language|files|blank|comment|code
Expand Down
2 changes: 1 addition & 1 deletion docs/Code/StatsCore.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.03 s (263.9 files/s, 55905.6 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.03 s (273.0 files/s, 57840.0 lines/s)
--- | ---

Language|files|blank|comment|code
Expand Down
2 changes: 1 addition & 1 deletion docs/Code/StatsSearch.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.05 s (189.7 files/s, 75257.8 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.05 s (190.3 files/s, 75504.5 lines/s)
--- | ---

Language|files|blank|comment|code
Expand Down
6 changes: 3 additions & 3 deletions docs/Code/StatsServer.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.06 s (322.5 files/s, 129877.5 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.06 s (317.2 files/s, 128088.1 lines/s)
--- | ---

Language|files|blank|comment|code
:-------|-------:|-------:|-------:|-------:
CSS|6|1341|34|3289
Python|9|294|193|1250
Python|9|296|204|1258
JavaScript|2|59|37|670
HTML|2|5|0|480
--------|--------|--------|--------|--------
SUM:|19|1699|264|5689
SUM:|19|1701|275|5697
2 changes: 1 addition & 1 deletion docs/Code/StatsTest.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.02 s (80.9 files/s, 54092.6 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.02 s (83.2 files/s, 55622.3 lines/s)
--- | ---

Language|files|blank|comment|code
Expand Down
6 changes: 3 additions & 3 deletions docs/Code/StatsToplevel.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.02 s (294.0 files/s, 31345.5 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.02 s (291.8 files/s, 31810.0 lines/s)
--- | ---

Language|files|blank|comment|code
:-------|-------:|-------:|-------:|-------:
Python|5|45|5|483
Python|5|48|3|494
--------|--------|--------|--------|--------
SUM:|5|45|5|483
SUM:|5|48|3|494
2 changes: 1 addition & 1 deletion docs/Code/StatsWriting.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cloc|github.com/AlDanial/cloc v 1.78 T=0.01 s (148.2 files/s, 35335.9 lines/s)
cloc|github.com/AlDanial/cloc v 1.78 T=0.01 s (134.1 files/s, 31991.5 lines/s)
--- | ---

Language|files|blank|comment|code
Expand Down
4 changes: 2 additions & 2 deletions docs/Writing/Hebrew.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<style>
@font-face {
font-family: "Ezra SIL";
src: url('https://github.com/Dans-labs/text-fabric/blob/master/tf/server/static/fonts/SILEOT.ttf?raw=true');
src: url('https://github.com/Dans-labs/text-fabric/blob/master/tf/server/static/fonts/SILEOT.woff?raw=true') format('woff');
src: url('https://github.com/annotation/text-fabric/blob/master/tf/server/static/fonts/SILEOT.ttf?raw=true');
src: url('https://github.com/annotation/text-fabric/blob/master/tf/server/static/fonts/SILEOT.woff?raw=true') format('woff');
}
</style>
<style>
Expand Down
4 changes: 2 additions & 2 deletions docs/Writing/Syriac.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<style>
@font-face {
font-family: "Estrangelo Edessa";
src: url('https://github.com/Dans-labs/text-fabric/blob/master/tf/server/static/fonts/SyrCOMEdessa.otf?raw=true');
src: url('https://github.com/Dans-labs/text-fabric/blob/master/tf/server/static/fonts/SyrCOMEdessa.woff?raw=true') format('woff');
src: url('https://github.com/annotation/text-fabric/blob/master/tf/server/static/fonts/SyrCOMEdessa.otf?raw=true');
src: url('https://github.com/annotation/text-fabric/blob/master/tf/server/static/fonts/SyrCOMEdessa.woff?raw=true') format('woff');
}
</style>
<style>
Expand Down
2 changes: 1 addition & 1 deletion legacydocs/codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"identifier": "http://doi.org/10.5281/zenodo.242384",
"codeRepository": "https://github.com/Dans-labs/text-fabric",
"codeRepository": "https://github.com/annotation/text-fabric",
"datePublished": "2017-03-07",
"dateModified": "2017-03-07",
"dateCreated": "2017-03-07",
Expand Down
2 changes: 1 addition & 1 deletion legacydocs/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<input type="hidden" id="side" name="side" value="{{side}}"/>
<div status="about">
<div>
<p><a target="_blank" href="https://github.com/Dans-labs/text-fabric">Text-Fabric</a> is made by
<p><a target="_blank" href="https://github.com/annotation/text-fabric">Text-Fabric</a> is made by
<a target="_blank" href="https://dans.knaw.nl/en/about/organisation-and-policy/staff/roorda">Dirk Roorda</a>,
<a target="_blank" href="https://dans.knaw.nl/en">DANS (Data Archiving and Networked Services</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion legacydocs/searchTutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"```\n",
"\n",
"See all ins and outs in the\n",
"[search template reference](https://dans-labs.github.io/text-fabric/Api/General/#search-templates).\n",
"[search template reference](https://annotation.github.io/text-fabric/Api/General/#search-templates).\n",
"\n",
"While it is a generic feature of TF, we provide tutorials for specific corpora, the Hebrew Bible\n",
"[bhsa](https://github.com/etcbc/bhsa) and a corpus of proto-cuneiform tablets\n",
Expand Down
30 changes: 15 additions & 15 deletions legacydocs/tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"In no time you will be a professional weaver.\n",
"\n",
"The tutorial is best understood after having familiarized yourself with the underlying\n",
"[data model](https://dans-labs.github.io/text-fabric/Model/Data-Model/).\n",
"[data model](https://annotation.github.io/text-fabric/Model/Data-Model/).\n",
"\n",
"If you want to *get* this all, see the \n",
"[home page](https://dans-labs.github.io/text-fabric/)\n",
"[home page](https://annotation.github.io/text-fabric/)\n",
"of the Text-Fabric documentation."
]
},
Expand Down Expand Up @@ -72,9 +72,9 @@
"output_type": "stream",
"text": [
"This is Text-Fabric 3.1.1\n",
"Api reference : https://github.com/Dans-labs/text-fabric/wiki/Api\n",
"Tutorial : https://github.com/Dans-labs/text-fabric/blob/master/docs/tutorial.ipynb\n",
"Example data : https://github.com/Dans-labs/text-fabric-data\n",
"Api reference : https://github.com/annotation/text-fabric/wiki/Api\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",
"118 features found and 0 ignored\n"
]
Expand Down Expand Up @@ -105,7 +105,7 @@
"**NB:** This is a real-world example of how to add data to an existing datasource as a module.\n",
"\n",
"And if you want to see what those standard locations are, look\n",
"[here](https://github.com/Dans-labs/text-fabric/blob/master/tf/fabric.py)."
"[here](https://github.com/annotation/text-fabric/blob/master/tf/fabric.py)."
]
},
{
Expand Down Expand Up @@ -359,7 +359,7 @@
"\n",
"## Count all nodes\n",
"We use the \n",
"[`N()` generator](https://dans-labs.github.io/text-fabric/Api/General/#navigating-nodes)\n",
"[`N()` generator](https://annotation.github.io/text-fabric/Api/General/#navigating-nodes)\n",
"to walk us through the nodes."
]
},
Expand Down Expand Up @@ -392,13 +392,13 @@
"## Sort some nodes\n",
"\n",
"Get some nodes, \n",
"[slot](https://dans-labs.github.io/text-fabric/Model/Data-Model/#at-a-glance)\n",
"[slot](https://annotation.github.io/text-fabric/Model/Data-Model/#at-a-glance)\n",
"and non-slot, and sort them in the \n",
"[canonical order](https://dans-labs.github.io/text-fabric/Api/General/#navigating-nodes).\n",
"[canonical order](https://annotation.github.io/text-fabric/Api/General/#navigating-nodes).\n",
"\n",
"The [`otype` feature](https://dans-labs.github.io/text-fabric/Model/Data-Model/#otype-node-feature)\n",
"The [`otype` feature](https://annotation.github.io/text-fabric/Model/Data-Model/#otype-node-feature)\n",
"is a\n",
"[WARP feature](https://dans-labs.github.io/text-fabric/Model/Data-Model/#more-about-the-warp),\n",
"[WARP feature](https://annotation.github.io/text-fabric/Model/Data-Model/#more-about-the-warp),\n",
"a special feature that provides defining characteristics for the\n",
"data set as a whole. \n",
"It tells us where the slots end and the other nodes start."
Expand Down Expand Up @@ -448,8 +448,8 @@
"source": [
"## Numbers in the otype feature\n",
"Get more information that is readily available in the \n",
"[WARP feature](https://dans-labs.github.io/text-fabric/Model/Data-Model/#more-about-the-warp)\n",
"[`otype`](https://dans-labs.github.io/text-fabric/Model/Data-Model/#otype-node-feature),\n",
"[WARP feature](https://annotation.github.io/text-fabric/Model/Data-Model/#more-about-the-warp)\n",
"[`otype`](https://annotation.github.io/text-fabric/Model/Data-Model/#otype-node-feature),\n",
"namely what types of objects there are in the dataset."
]
},
Expand Down Expand Up @@ -546,10 +546,10 @@
"\n",
"The content data resides in the features.\n",
"The\n",
"[`F` function](https://dans-labs.github.io/text-fabric/Api/General/#node-features)\n",
"[`F` function](https://annotation.github.io/text-fabric/Api/General/#node-features)\n",
"gives access to that data.\n",
"Every feature has a method\n",
"[`freqList()`](https://dans-labs.github.io/text-fabric/Api/General/#node-features)\n",
"[`freqList()`](https://annotation.github.io/text-fabric/Api/General/#node-features)\n",
"to generate a frequency list of its values, ordered by highest frequency first."
]
},
Expand Down
24 changes: 12 additions & 12 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ site_description: >-
for (ancient) text plus
(linguistic) annotations.
site_url: 'https://dans-labs.github.io/text-fabric/'
site_url: 'https://annotation.github.io/text-fabric/'

site_author: Dirk Roorda

Expand Down Expand Up @@ -100,12 +100,12 @@ extra:
flask: http://flask.pocoo.org/docs/1.0/
fontlib: https://fontlibrary.org
ghapi: https://developer.github.com/v3/
ghissues: https://github.com/Dans-labs/text-fabric/issues
ghissues: https://github.com/annotation/text-fabric/issues
git: https://git-scm.com/downloads
jensengh: https://github.com/ch-jensen/Semantic-mapping-of-participants
jquery: https://api.jquery.com
jup: https://jupyter.org
lfgh: https://github.com/Dans-labs/laf-fabric
lfgh: https://github.com/annotation/laf-fabric
mkdocs: https://mkdocs.readthedocs.io/en/stable/
moz_color: https://developer.mozilla.org/en-US/docs/Web/CSS/color_value
moz_details: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details
Expand All @@ -123,15 +123,15 @@ extra:
pthugh: https://github.com/pthu
sbl1: https://global-learning.org/mod/forum/discuss.php?d=22
shebanq: https://shebanq.ancient-data.org
tfdgh: https://github.com/Dans-labs/text-fabric-data
tfdnb: https://nbviewer.jupyter.org/github/Dans-labs/text-fabric-data/blob/master
tfdghb: https://github.com/Dans-labs/text-fabric-data/blob/master
tfdght: https://github.com/Dans-labs/text-fabric-data/tree/master
tfdgh: https://github.com/annotation/text-fabric-data
tfdnb: https://nbviewer.jupyter.org/github/annotation/text-fabric-data/blob/master
tfdghb: https://github.com/annotation/text-fabric-data/blob/master
tfdght: https://github.com/annotation/text-fabric-data/tree/master
tfdoi: https://doi.org/10.5281/zenodo.592193
tfgh: https://github.com/Dans-labs/text-fabric
tfghb: https://github.com/Dans-labs/text-fabric/blob/master
tfght: https://github.com/Dans-labs/text-fabric/tree/master
tfnb: https://nbviewer.jupyter.org/github/dans-labs/text-fabric/blob/master
tfgh: https://github.com/annotation/text-fabric
tfghb: https://github.com/annotation/text-fabric/blob/master
tfght: https://github.com/annotation/text-fabric/tree/master
tfnb: https://nbviewer.jupyter.org/github/annotation/text-fabric/blob/master
tfpp: https://pypi.org/project/text-fabric/
ubiq1: https://www.ubiquitypress.com/site/chapters/10.5334/bbi.18/
weave: https://sew4home.com/tips-resources/buying-guide/all-about-fabric-weaves-tutorial
Expand All @@ -145,7 +145,7 @@ theme:
favicon: 'images/icon/favicon.ico'
feature:
tabs: false
repo_url: 'https://github.com/dans-labs/text-fabric/'
repo_url: 'https://github.com/annotation/text-fabric/'

strict: false

Expand Down
9 changes: 2 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,11 @@
packages=[
'tf',
'tf.applib',
'tf.apps',
'tf.convert',
'tf.core',
'tf.search',
'tf.server',
'tf.writing',
'tf.apps.bhsa',
'tf.apps.peshitta',
'tf.apps.syrnt',
'tf.apps.uruk',
],
install_requires=[
'rpyc',
Expand All @@ -38,7 +33,7 @@
description='''Processor and browser for Text Fabric Data''',
author='Dirk Roorda',
author_email='[email protected]',
url='https://github.com/Dans-labs/text-fabric',
url='https://github.com/annotation/text-fabric',
keywords=[
'text', 'linguistics',
'database', 'graph',
Expand Down Expand Up @@ -72,6 +67,6 @@
Tools to read text corpora with (linguistic) annotations
and process them efficiently.
With a built in web-interface for querying a corpus.
More info on https://dans-labs.github.io/text-fabric/
More info on https://annotation.github.io/text-fabric/
''',
)
2 changes: 1 addition & 1 deletion test/async/test1.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"data": {
"text/plain": [
"<module 'tf.apps.bhsa.config' from '/Users/dirk/github/Dans-labs/text-fabric/tf/apps/bhsa/config.py'>"
"<module 'tf.apps.bhsa.config' from '/Users/dirk/github/annotation/text-fabric/tf/apps/bhsa/config.py'>"
]
},
"execution_count": 2,
Expand Down
Loading

0 comments on commit 813f578

Please sign in to comment.