Move delphin.mrs.vpm to delphin.vpm

Part of #124
delph-in · Apr 18, 2019 · e62694e · e62694e
1 parent 7553c45
commit e62694e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,6 +74,7 @@ these changes are prefixed with "**BREAKING**"
 * `delphin.mrs.components._VarGenerator` to `delphin.variable.VariableFactory`
 * `delphin.mrs.config.UNKNOWNSORT` to `delphin.variable.UNKNOWN`
 * `delphin.mrs.config.HANDLESORT` to `delphin.variable.HANDLE`
+* `delphin.mrs.vpm` to `delphin.vpm`
 
 ### Removed
 

diff --git a/delphin/mrs/vpm.py → delphin/vpm.py b/delphin/mrs/vpm.py → delphin/vpm.py
@@ -35,7 +35,7 @@ def load(source, semi=None):
     Args:
         source: a filename or file-like object containing the VPM
             definitions
-        semi (:class:`~delphin.mrs.semi.SemI`, optional): if provided,
+        semi (:class:`~delphin.semi.SemI`, optional): if provided,
             it is passed to the VPM constructor
     Returns:
         a :class:`VPM` instance
@@ -109,7 +109,7 @@ class VPM(object):
             featmap is a tuple of two lists: (source_features,
             target_features); and valmap is a list of value tuples:
             (source_values, OP, target_values)
-        semi (:class:`~delphin.mrs.semi.SemI`, optional): if provided,
+        semi (:class:`~delphin.semi.SemI`, optional): if provided,
             this is used for more sophisticated value comparisons
     """
 

diff --git a/docs/api/delphin.mrs.rst b/docs/api/delphin.mrs.rst
@@ -17,5 +17,4 @@ delphin.mrs
   delphin.mrs.query.rst
   delphin.mrs.simpledmrs.rst
   delphin.mrs.simplemrs.rst
-  delphin.mrs.vpm.rst
   delphin.mrs.xmrs.rst
diff --git a/docs/api/delphin.mrs.vpm.rst → docs/api/delphin.vpm.rst b/docs/api/delphin.mrs.vpm.rst → docs/api/delphin.vpm.rst
@@ -1,8 +1,8 @@
 
-delphin.mrs.vpm
-===============
+delphin.vpm
+===========
 
-.. automodule:: delphin.mrs.vpm
+.. automodule:: delphin.vpm
 
    Module functions
    ----------------

diff --git a/docs/index.rst b/docs/index.rst
@@ -47,6 +47,7 @@ PyDelphin
   api/delphin.tokens.rst
   api/delphin.tsql.rst
   api/delphin.variable.rst
+  api/delphin.vpm.rst
 
 
 Indices and tables

diff --git a/tests/mrs_vpm_test.py → tests/vpm_test.py b/tests/mrs_vpm_test.py → tests/vpm_test.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-from delphin.mrs import vpm
+from delphin import vpm
 
 
 def test_invalid():