From 34f8ff4babdbd8653b1e763e6af7658bea5e2898 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Wed, 24 Feb 2016 10:53:06 +0100 Subject: [PATCH 1/4] [fix] pip git+ does shit with static files --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4dee87f..a8a38d2 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ import os from setuptools import setup -from operator import add try: from pypandoc import convert @@ -31,6 +30,6 @@ setup(name='prosopopee', keywords='', include_package_data=True, package_data={ - 'prosopopee': reduce(add, [[x[0].replace("prosopopee/", "", 1) + y for y in x[2]] for x in os.walk("prosopopee/themes/")], []), + 'prosopopee': ["%s/*" % x[0] for x in os.walk("prosopopee/themes/") if x[2]], }, ) From 9a9f75dec5d9649f70f1fe63f5b4746b45ef0fa8 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Wed, 24 Feb 2016 10:56:33 +0100 Subject: [PATCH 2/4] [fix] weird path --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a8a38d2..1c3b80a 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,6 @@ setup(name='prosopopee', keywords='', include_package_data=True, package_data={ - 'prosopopee': ["%s/*" % x[0] for x in os.walk("prosopopee/themes/") if x[2]], + 'prosopopee': ["%s/*" % x[0].replace("prosopopee/", "", 1) for x in os.walk("prosopopee/themes/") if x[2]], }, ) From 52f0441ff55195b3723f51a7a5cf828710b87814 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Wed, 24 Feb 2016 14:06:28 +0100 Subject: [PATCH 3/4] [fix] meh --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1c3b80a..9d792b2 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,6 @@ setup(name='prosopopee', keywords='', include_package_data=True, package_data={ - 'prosopopee': ["%s/*" % x[0].replace("prosopopee/", "", 1) for x in os.walk("prosopopee/themes/") if x[2]], + 'prosopopee': ['themes/*/*/*/*', 'themes/*/templates/*.html', 'themes/*/templates/section/*.html'], }, ) From 8c1abf288ff345723fc4a30c686576f0851e302d Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Wed, 24 Feb 2016 14:14:48 +0100 Subject: [PATCH 4/4] [mod] removeuseless import --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 9d792b2..75747c4 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/python # -*- coding:Utf-8 -*- -import os from setuptools import setup try: