Prep for merge with gri-is version

thegetty · Dec 18, 2016 · 5daa9d3 · 5daa9d3
1 parent f175e48
commit 5daa9d3
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 526 deletions.
diff --git a/.gitignore b/.gitignore
@@ -87,3 +87,5 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,17 @@
+language: python
+python:
+  - '2.7'
+  - '3.3'
+  - '3.4'
+  - '3.5'
+install: 
+  - pip install -r requirements.txt
+  - pip install coveralls
+notifications:
+  email:
+    recipients:
+      - [email protected]
+script:
+  coverage run --source=crmpy setup.py test
+after_success:
+  coveralls
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/gri-is/Python-CIDOC-ORM.svg?branch=master)](https://travis-ci.org/gri-is/Python-CIDOC-ORM) [![Coverage Status](https://coveralls.io/repos/github/gri-is/Python-CIDOC-ORM/badge.svg?branch=master)](https://coveralls.io/github/gri-is/Python-CIDOC-ORM?branch=master)
+
 # Python-CIDOC-ORM
 Python library to make creation of CIDOC CRM easier by mapping classes/predicates to python objects
 

diff --git a/build_tsv/vocab_reader.py b/build_tsv/vocab_reader.py
@@ -141,6 +141,6 @@
 	stuff.append([name, "property", ccname, label, comment, subProp, domn, rang, inverse])
 
 outdata = '\n'.join(['\t'.join(x) for x in stuff])
-fh = codecs.open('crm_vocab.tsv', 'w', 'utf-8')
+fh = codecs.open('../data/crm_vocab.tsv', 'w', 'utf-8')
 fh.write(outdata)
 fh.close()
diff --git a/build_tsv/vocab_reader_old.py b/build_tsv/vocab_reader_old.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -87,3 +87,5 @@ ENV/

		# Rope project settings
		.ropeproject

		.DS_Store