Merge pull request #3 from ellisonleao/master

Fix #2

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..877f423
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,56 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Rope
+.ropeproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
+
+# DB files
+*.db

diff --git a/MANIFEST.in b/MANIFEST.in
index ed015fbce3f4e6892710e5ff27348192afc3c7f1..08270fc5ac296afcab9051179ef3d416459e06c3 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include README.rst
 include rainbowstream/image.c
+recursive-include rainbowstream/colorset *.json

diff --git a/setup.py b/setup.py
index b7c940bc8ee429f434818eff580aea106bb6d50e..42711230d9ca60cb4c2e212430d0756a29d0980a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.1.4'
+version = '0.1.5'
 
 install_requires = [
     "SQLAlchemy",