From 73e517eb34207ffb5fb5aa0d0a66241f92a8fbf0 Mon Sep 17 00:00:00 2001 From: guyemerson Date: Tue, 24 May 2016 17:55:16 +0200 Subject: [PATCH] pydelphin dependency --- pydmrs/pydelphin_interface.py | 9 ++++----- setup.py | 7 +++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pydmrs/pydelphin_interface.py b/pydmrs/pydelphin_interface.py index 4cba648..e0d6069 100644 --- a/pydmrs/pydelphin_interface.py +++ b/pydmrs/pydelphin_interface.py @@ -1,14 +1,13 @@ -from configparser import ConfigParser from delphin.interfaces import ace from delphin.mrs import simplemrs, dmrx from pydmrs.core import ListDmrs +from pydmrs.utils import load_config, get_config_option -DEFAULT_CONFIG_FILE = '../configs/default_interface.conf' +DEFAULT_CONFIG_FILE = 'default_interface.conf' -config = ConfigParser() -config.read(DEFAULT_CONFIG_FILE) -DEFAULT_ERG_FILE = config.get('Grammar', 'ERG') +config = load_config(DEFAULT_CONFIG_FILE) +DEFAULT_ERG_FILE = config.get(config, 'Grammar', 'ERG') def parse(sentence, cls=ListDmrs, erg_file=DEFAULT_ERG_FILE): diff --git a/setup.py b/setup.py index c4f3605..430b4fa 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from distutils.core import setup +from setuptools import setup setup( name = 'pydmrs', packages = ['pydmrs'], # this must be the same as the name above @@ -6,8 +6,11 @@ description = 'A library for manipulating DMRS graphs', author = 'Ann Copestake, Guy Emerson, Mike Goodman, Matic Horvat, Alex Kuhnle, Ewa Muszyńska', author_email = 'gete2@cam.ac.uk', + license = 'MIT', url = 'https://github.com/delph-in/pydmrs', download_url = 'https://github.com/delph-in/pydmrs/tarball/1.0.0', keywords = ['NLP', 'Natural Language Processing', 'Computational Linguistics', 'Semantics'], - classifiers = [], + install_requires = [ + 'pydelphin' + ] ) \ No newline at end of file