Merge 584aaf8 into 7da0181

lexmapr · Oct 2, 2018 · 7517445 · 7517445
2 parents 7da0181 + 584aaf8
commit 7517445
Show file tree

Hide file tree

Showing 33 changed files with 2,124 additions and 967 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,6 @@
+[run]
+omit =
+    # temporarily omit these files until we find out a way to bring
+    # them in remotely
+    lexmapr/ontofetch.py
+    lexmapr/ontohelper.py
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.7"
   - "3.6"
 os:
   - linux
@@ -12,9 +11,6 @@ git:
 # TODO: remove these two settings after refactoring pipeline
 env:
   - PYTHONHASHSEED=0
-matrix:
-  allow_failures:
-    - python: "2.7"
 
 install:
   - sudo apt-get update -qq

diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ The main script file for processing is `bin/lexmapr`
 - [inflection](https://pypi.org/project/inflection/)
 - [wikipedia](https://pypi.org/project/wikipedia/)
 - [python-dateutil](https://pypi.org/project/python-dateutil/)
+- [rdflib](https://pypi.org/project/rdflib/)
 
 ## Usage
 

diff --git a/bin/lexmapr b/bin/lexmapr
@@ -19,7 +19,7 @@ if __name__ == '__main__':
                         help='Output file')
     parser.add_argument('log_file', nargs='?', default=sys.stderr,
                         help='Log file')
-    parser.add_argument('-f', '--format', default='full',
+    parser.add_argument('-f', '--format', default='basic',
                         help='Output format')
     parser.add_argument('--version', action='store_true', dest='version',
                         help='Prints version information.', required=False)

diff --git a/lexmapr/__init__.py b/lexmapr/__init__.py
@@ -1 +1 @@
-__version__ = '0.1.1'
+__version__ = '0.1.2'