fixes package installation

bcarlin · Jul 10, 2015 · 344f460 · 344f460
1 parent bfaf87b
commit 344f460
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 32 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,4 @@
+include tox.ini
+include AUTHORS
+include README.rst
+include LICENSE.txt
diff --git a/doc/conf.py b/doc/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.4'
+release = '0.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/index.rst b/doc/index.rst
@@ -214,7 +214,14 @@ APIs
 Changes
 -------
 
-0.4 (2015/07/09)
+0.5 (2015/07/10)
+~~~~~~~~~~~~~~~~
+
+* Fixes setup.py (`#15 <https://github.com/bcarlin/flask-scss/issues/15>`_)
+
+
+
+0.4 (2015/07/10)
 ~~~~~~~~~~~~~~~~
 
 * Compatibility with python 3.3+

diff --git a/setup.cfg b/setup.cfg
@@ -7,5 +7,5 @@ all_files = 1
 upload-dir = doc/.build/html
 
 [aliases]
-release = register sdist build_wheel upload build_sphinx upload_docs
+release = register sdist bdist_wheel upload build_sphinx upload_docs
 
diff --git a/setup.py b/setup.py
@@ -8,21 +8,9 @@
     LONG_DOC = readme.read()
 
 
-def make_data_files(root_path, base_target):
-    ret = []
-    tmp = []
-    for elem in os.listdir(root_path):
-        full_path = os.path.join(root_path, elem)
-        if os.path.isfile(full_path):
-            tmp.append(full_path)
-        else:
-            ret += make_data_files(full_path, os.path.join(base_target, elem))
-    ret.append((base_target, tmp))
-    return ret
-
 setup(
     name='Flask-Scss',
-    version='0.4',
+    version='0.5',
     url='https://github.com/bcarlin/flask-scss',
     license='MIT',
     author='Bruno Carlin',
@@ -35,7 +23,7 @@ def make_data_files(root_path, base_target):
     install_requires=[
         'Flask', 'pyScss'
     ],
-    data_files=make_data_files('doc/.build/html', 'doc') + [
+    data_files=[
         ('.', ['tox.ini', 'LICENSE.txt', 'README.rst', 'AUTHORS']),
     ],
     classifiers=[

diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-;envlist = py25,py26,py27
 envlist = py26,py27,py33,py34
 
 [testenv]
-setenv=
-    PATH={envbindir}:$PATH
+;setenv=
+;    PATH={envbindir}:$PATH
 commands=python -m unittest test_scss
 
 [testenv:py27]
@@ -28,14 +27,3 @@ commands=
     pip freeze
     nosetests
 
-;[testenv:py25]
-;setenv=
-;    PIP_INSECURE=True
-;deps=
-;    unittest2
-;    mock
-;    nose
-;basepython=/usr/bin/python2.5
-;commands=
-;    pip freeze
-;    nosetests