Merge remote-tracking branch 'origin/refactor'

sumpfork · Nov 21, 2015 · 6aa9c28 · 6aa9c28
2 parents c919913 + fbc456c
commit 6aa9c28
Show file tree

Hide file tree

Showing 14 changed files with 1,682 additions and 1,627 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies
+install:
+  - pip install -U setuptools
+  - pip install .
+# command to run tests
+script: nosetests
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,3 @@
-include dominion_cards.txt
-include dominion_card_extras.txt
-include *.png
+include card_db/*/*.json
 include images/*.png
-exclude card_images/*
-exclude old_images/*
 
diff --git a/__init__.py b/__init__.py
@@ -1,3 +1,3 @@
 # main package
 
-__version__ = '1.9.1'
+__version__ = '2.0'