Skip to content

Commit

Permalink
Merge branch '95-python3.5-support' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
j0hn committed Aug 25, 2016
2 parents 2c388b4 + 4a0b830 commit cd21f92
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
8 changes: 8 additions & 0 deletions README.rst
Expand Up @@ -55,6 +55,14 @@ Then simply install with **pip**:
Full details about the installation is available on the
`Read the Docs <http://iepy.readthedocs.org/en/latest/installation.html>`__ page.

Running the tests
-----------------

If you are contributing to the project and want to run the tests, all you have to do is:

- Make sure your JAVAHOME is correctly set. `Read more about it here <http://iepy.readthedocs.io/en/latest/installation.html#install-iepy-package>`_
- In the root of the project run `nosetests`

Learn more
----------

Expand Down
4 changes: 2 additions & 2 deletions iepy/preprocess/ner/stanford.py
Expand Up @@ -3,7 +3,7 @@
import os.path
import logging

from nltk.tag.stanford import NERTagger
from nltk.tag.stanford import StanfordNERTagger
import wget

from iepy.preprocess.ner.base import BaseNERRunner
Expand All @@ -14,7 +14,7 @@
download_url_base = 'http://nlp.stanford.edu/software/'


class NonTokenizingNERTagger(NERTagger):
class NonTokenizingNERTagger(StanfordNERTagger):

@property
def _cmd(self):
Expand Down
4 changes: 2 additions & 2 deletions iepy/preprocess/tagger.py
Expand Up @@ -2,7 +2,7 @@
import os.path
import logging

from nltk.tag.stanford import POSTagger
from nltk.tag.stanford import StanfordPOSTagger
import wget

from iepy.preprocess.pipeline import BasePreProcessStepRunner, PreProcessSteps
Expand Down Expand Up @@ -52,7 +52,7 @@ def __init__(self, override=False):
raise LookupError("Stanford POS tagger not found. Try running the "
"command download_third_party_data.py")

postagger = POSTagger(
postagger = StanfordPOSTagger(
os.path.join(tagger_path, 'models', 'english-bidirectional-distsim.tagger'),
os.path.join(tagger_path, 'stanford-postagger.jar'),
encoding='utf8')
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -10,7 +10,7 @@
with open(path.join(HERE, 'iepy', 'version.txt'), encoding='utf-8') as f:
iepy_version = f.read().strip()

base_reqs = """nltk==3.0.0
base_reqs = """nltk==3.2.1
numpy>=1.8.0
scipy>=0.13.3
scikit-learn==0.15.2
Expand All @@ -21,7 +21,7 @@
wget==2.0
colorama==0.2.7
featureforge>=0.1.5
Django==1.7.6
Django==1.8.14
django-relatives==0.3.1
django-relatedadminwidget==0.0.3
six>=1.9.0
Expand Down

0 comments on commit cd21f92

Please sign in to comment.