Merge branch 'master' of github.com:proycon/pynlpl

proycon · Apr 11, 2017 · 24be3db · 24be3db
2 parents 4087fe3 + 273ebc6
commit 24be3db
Show file tree

Hide file tree

Showing 66 changed files with 7 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y xmldiff
   - pip install -U setuptools
-install: 
+install:
     - pip install -r requirements.txt
     - python setup.py install
-script:  
-    - bash tests/test.sh
+script:
+    - bash pynlpl/tests/test.sh
diff --git a/__init__.py → pynlpl/__init__.py b/__init__.py → pynlpl/__init__.py
@@ -2,4 +2,4 @@
 
 The library is divided into several packages and modules. It is designed for Python 2.6 and upwards. Including Python 3."""
 
-VERSION = "1.1.8"
+VERSION = "1.1.9"
diff --git a/algorithms.py → pynlpl/algorithms.py b/algorithms.py → pynlpl/algorithms.py
diff --git a/clients/__init__.py → pynlpl/clients/__init__.py b/clients/__init__.py → pynlpl/clients/__init__.py
diff --git a/clients/cornetto.py → pynlpl/clients/cornetto.py b/clients/cornetto.py → pynlpl/clients/cornetto.py
diff --git a/clients/freeling.py → pynlpl/clients/freeling.py b/clients/freeling.py → pynlpl/clients/freeling.py
diff --git a/clients/frogclient.py → pynlpl/clients/frogclient.py b/clients/frogclient.py → pynlpl/clients/frogclient.py
diff --git a/common.py → pynlpl/common.py b/common.py → pynlpl/common.py
diff --git a/datatypes.py → pynlpl/datatypes.py b/datatypes.py → pynlpl/datatypes.py
diff --git a/evaluation.py → pynlpl/evaluation.py b/evaluation.py → pynlpl/evaluation.py
diff --git a/formats/__init__.py → pynlpl/formats/__init__.py b/formats/__init__.py → pynlpl/formats/__init__.py
diff --git a/formats/cgn.py → pynlpl/formats/cgn.py b/formats/cgn.py → pynlpl/formats/cgn.py
diff --git a/formats/cql.py → pynlpl/formats/cql.py b/formats/cql.py → pynlpl/formats/cql.py
diff --git a/formats/dutchsemcor.py → pynlpl/formats/dutchsemcor.py b/formats/dutchsemcor.py → pynlpl/formats/dutchsemcor.py
diff --git a/formats/folia.py → pynlpl/formats/folia.py b/formats/folia.py → pynlpl/formats/folia.py
@@ -788,7 +788,8 @@ def text(self, cls='current', retaintokenisation=False, previousdelimiter="",str
             delimiter = ""
             s = ""
             for e in self:
-                if e.PRINTABLE and not isinstance(e, TextContent) and not isinstance(e, String):
+                #was: e.PRINTABLE and not isinstance(e, TextContent) and not isinstance(e, String):
+                if isinstance(e, (AbstractStructureElement, Correction, AbstractSpanAnnotation)):   #AbstractSpanAnnotation is needed when requesting text() on nested span annotations
                     try:
                         s += e.text(cls,retaintokenisation, delimiter,False,correctionhandling)
 

diff --git a/formats/foliaset.py → pynlpl/formats/foliaset.py b/formats/foliaset.py → pynlpl/formats/foliaset.py
diff --git a/formats/fql.py → pynlpl/formats/fql.py b/formats/fql.py → pynlpl/formats/fql.py
diff --git a/formats/giza.py → pynlpl/formats/giza.py b/formats/giza.py → pynlpl/formats/giza.py
diff --git a/formats/imdi.py → pynlpl/formats/imdi.py b/formats/imdi.py → pynlpl/formats/imdi.py
diff --git a/formats/moses.py → pynlpl/formats/moses.py b/formats/moses.py → pynlpl/formats/moses.py
diff --git a/formats/sonar.py → pynlpl/formats/sonar.py b/formats/sonar.py → pynlpl/formats/sonar.py
diff --git a/formats/taggerdata.py → pynlpl/formats/taggerdata.py b/formats/taggerdata.py → pynlpl/formats/taggerdata.py
diff --git a/formats/timbl.py → pynlpl/formats/timbl.py b/formats/timbl.py → pynlpl/formats/timbl.py
diff --git a/fsa.py → pynlpl/fsa.py b/fsa.py → pynlpl/fsa.py
diff --git a/lm/__init__.py → pynlpl/lm/__init__.py b/lm/__init__.py → pynlpl/lm/__init__.py
diff --git a/lm/client.py → pynlpl/lm/client.py b/lm/client.py → pynlpl/lm/client.py
diff --git a/lm/lm.py → pynlpl/lm/lm.py b/lm/lm.py → pynlpl/lm/lm.py
diff --git a/lm/makesrilmcc → pynlpl/lm/makesrilmcc b/lm/makesrilmcc → pynlpl/lm/makesrilmcc
diff --git a/lm/server.py → pynlpl/lm/server.py b/lm/server.py → pynlpl/lm/server.py
diff --git a/lm/srilm.cc → pynlpl/lm/srilm.cc b/lm/srilm.cc → pynlpl/lm/srilm.cc
diff --git a/lm/srilm.py → pynlpl/lm/srilm.py b/lm/srilm.py → pynlpl/lm/srilm.py
diff --git a/mt/__init__.py → pynlpl/mt/__init__.py b/mt/__init__.py → pynlpl/mt/__init__.py
diff --git a/mt/wordalign.py → pynlpl/mt/wordalign.py b/mt/wordalign.py → pynlpl/mt/wordalign.py
diff --git a/net.py → pynlpl/net.py b/net.py → pynlpl/net.py
diff --git a/search.py → pynlpl/search.py b/search.py → pynlpl/search.py
diff --git a/statistics.py → pynlpl/statistics.py b/statistics.py → pynlpl/statistics.py
diff --git a/tagger.py → pynlpl/tagger.py b/tagger.py → pynlpl/tagger.py
diff --git a/tests/__init__.py → pynlpl/tests/__init__.py b/tests/__init__.py → pynlpl/tests/__init__.py
diff --git a/tests/cgn.py → pynlpl/tests/cgn.py b/tests/cgn.py → pynlpl/tests/cgn.py
diff --git a/tests/cql.py → pynlpl/tests/cql.py b/tests/cql.py → pynlpl/tests/cql.py
diff --git a/tests/datatypes.py → pynlpl/tests/datatypes.py b/tests/datatypes.py → pynlpl/tests/datatypes.py
diff --git a/tests/evaluation.py → pynlpl/tests/evaluation.py b/tests/evaluation.py → pynlpl/tests/evaluation.py
diff --git a/tests/evaluation_timbl/test → pynlpl/tests/evaluation_timbl/test b/tests/evaluation_timbl/test → pynlpl/tests/evaluation_timbl/test
diff --git a/tests/evaluation_timbl/test.IB1.O.gr.k1.out → ...sts/evaluation_timbl/test.IB1.O.gr.k1.out b/tests/evaluation_timbl/test.IB1.O.gr.k1.out → ...sts/evaluation_timbl/test.IB1.O.gr.k1.out
diff --git a/tests/evaluation_timbl/timbltest.sh → pynlpl/tests/evaluation_timbl/timbltest.sh b/tests/evaluation_timbl/timbltest.sh → pynlpl/tests/evaluation_timbl/timbltest.sh
diff --git a/tests/evaluation_timbl/train → pynlpl/tests/evaluation_timbl/train b/tests/evaluation_timbl/train → pynlpl/tests/evaluation_timbl/train
diff --git a/tests/folia.py → pynlpl/tests/folia.py b/tests/folia.py → pynlpl/tests/folia.py
diff --git a/tests/folia_benchmark.py → pynlpl/tests/folia_benchmark.py b/tests/folia_benchmark.py → pynlpl/tests/folia_benchmark.py
diff --git a/tests/formats.py → pynlpl/tests/formats.py b/tests/formats.py → pynlpl/tests/formats.py
diff --git a/tests/fql.py → pynlpl/tests/fql.py b/tests/fql.py → pynlpl/tests/fql.py
diff --git a/tests/search.py → pynlpl/tests/search.py b/tests/search.py → pynlpl/tests/search.py
diff --git a/tests/statistics.py → pynlpl/tests/statistics.py b/tests/statistics.py → pynlpl/tests/statistics.py
diff --git a/tests/test.sh → pynlpl/tests/test.sh b/tests/test.sh → pynlpl/tests/test.sh
diff --git a/tests/textprocessors.py → pynlpl/tests/textprocessors.py b/tests/textprocessors.py → pynlpl/tests/textprocessors.py
diff --git a/textprocessors.py → pynlpl/textprocessors.py b/textprocessors.py → pynlpl/textprocessors.py
diff --git a/tools/__init__.py → pynlpl/tools/__init__.py b/tools/__init__.py → pynlpl/tools/__init__.py
diff --git a/tools/computepmi.py → pynlpl/tools/computepmi.py b/tools/computepmi.py → pynlpl/tools/computepmi.py
diff --git a/tools/foliasplitcgnpostags.py → pynlpl/tools/foliasplitcgnpostags.py b/tools/foliasplitcgnpostags.py → pynlpl/tools/foliasplitcgnpostags.py
diff --git a/tools/freqlist.py → pynlpl/tools/freqlist.py b/tools/freqlist.py → pynlpl/tools/freqlist.py
diff --git a/tools/frogwrapper.py → pynlpl/tools/frogwrapper.py b/tools/frogwrapper.py → pynlpl/tools/frogwrapper.py
diff --git a/tools/phrasetableserver.py → pynlpl/tools/phrasetableserver.py b/tools/phrasetableserver.py → pynlpl/tools/phrasetableserver.py
diff --git a/tools/reflow.py → pynlpl/tools/reflow.py b/tools/reflow.py → pynlpl/tools/reflow.py
diff --git a/tools/sampler.py → pynlpl/tools/sampler.py b/tools/sampler.py → pynlpl/tools/sampler.py
diff --git a/tools/sonar2folia.py → pynlpl/tools/sonar2folia.py b/tools/sonar2folia.py → pynlpl/tools/sonar2folia.py
diff --git a/tools/sonarlemmafreqlist.py → pynlpl/tools/sonarlemmafreqlist.py b/tools/sonarlemmafreqlist.py → pynlpl/tools/sonarlemmafreqlist.py
diff --git a/setup.py b/setup.py
@@ -8,24 +8,6 @@
 import sys
 from setuptools import setup, find_packages
 
-if os.path.dirname(__file__) != "":
-    os.chdir(os.path.dirname(__file__))
-if not os.path.exists('pynlpl'):
-    print("Preparing build",file=sys.stderr)
-    if os.path.exists('build'):
-        os.system('rm -Rf build')
-    os.mkdir('build')
-    os.chdir('build')
-    if not os.path.exists('pynlpl'): os.mkdir('pynlpl')
-    os.system('cp -Rpf ../* pynlpl/ 2> /dev/null')
-    os.system('mv -f pynlpl/setup.py pynlpl/setup.cfg .')
-    os.system('cp -f pynlpl/README.rst .')
-    os.system('cp -f pynlpl/LICENSE .')
-    os.system('cp -f pynlpl/MANIFEST.in .')
-
-    #Do not include unfininished WIP modules:
-    os.system('rm -f pynlpl/formats/colibri.py pynlpl/formats/alpino.py pynlpl/foliaprocessing.py pynlpl/grammar.py')
-
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
@@ -41,7 +23,7 @@ def read(fname):
 
 setup(
     name = "PyNLPl",
-    version = "1.1.8", #edit version in __init__.py as well and ensure tests/folia.py FOLIARELEASE points to the right version!
+    version = "1.1.9", #edit version in __init__.py as well and ensure tests/folia.py FOLIARELEASE points to the right version!
     author = "Maarten van Gompel",
     author_email = "proycon@anaproy.nl",
     description = ("PyNLPl, pronounced as 'pineapple', is a Python library for Natural Language Processing. It contains various modules useful for common, and less common, NLP tasks. PyNLPl contains modules for basic tasks, clients for interfacting with server, and modules for parsing several file formats common in NLP, most notably FoLiA."),