From c34e52f0b1d821b84a314e54781ad45322249c9d Mon Sep 17 00:00:00 2001 From: "Sean C. Farley" Date: Wed, 1 Feb 2012 14:16:34 -0500 Subject: [PATCH 1/4] Exclude static/css from package_data since package_data does not handle the copying of subdirectories implicitly. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 690a7e0fd..a075fcaf5 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,9 @@ setup( 'djangorestframework.runtests', 'djangorestframework.utils'], package_dir={'djangorestframework': 'djangorestframework'}, - package_data = {'djangorestframework': ['templates/*', 'static/*']}, + package_data = {'djangorestframework': ['templates/*', 'static/*', + 'static/css/*']}, + exclude_package_data = {'djangorestframework': ['static/css']}, test_suite = 'djangorestframework.runtests.runcoverage.main', install_requires=['URLObject>=0.6.0'], classifiers = [ From eeac9bdd77bf678883eaca2f1b15c1d4ab88e631 Mon Sep 17 00:00:00 2001 From: "Sean C. Farley" Date: Wed, 1 Feb 2012 14:16:34 -0500 Subject: [PATCH 2/4] Fix setup.py build with static/css directory Exclude static/css from package_data since package_data does not handle the copying of subdirectories implicitly to fix the build. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 690a7e0fd..a075fcaf5 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,9 @@ setup( 'djangorestframework.runtests', 'djangorestframework.utils'], package_dir={'djangorestframework': 'djangorestframework'}, - package_data = {'djangorestframework': ['templates/*', 'static/*']}, + package_data = {'djangorestframework': ['templates/*', 'static/*', + 'static/css/*']}, + exclude_package_data = {'djangorestframework': ['static/css']}, test_suite = 'djangorestframework.runtests.runcoverage.main', install_requires=['URLObject>=0.6.0'], classifiers = [ From e715e9256044f62d24a014144dfac07eadb3ba29 Mon Sep 17 00:00:00 2001 From: "Sean C. Farley" Date: Wed, 1 Feb 2012 14:41:57 -0500 Subject: [PATCH 3/4] Revert "Fix setup.py build with static/css directory" This reverts commit eeac9bdd77bf678883eaca2f1b15c1d4ab88e631. --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a075fcaf5..690a7e0fd 100644 --- a/setup.py +++ b/setup.py @@ -24,9 +24,7 @@ setup( 'djangorestframework.runtests', 'djangorestframework.utils'], package_dir={'djangorestframework': 'djangorestframework'}, - package_data = {'djangorestframework': ['templates/*', 'static/*', - 'static/css/*']}, - exclude_package_data = {'djangorestframework': ['static/css']}, + package_data = {'djangorestframework': ['templates/*', 'static/*']}, test_suite = 'djangorestframework.runtests.runcoverage.main', install_requires=['URLObject>=0.6.0'], classifiers = [ From fa017e318b790af128bb042f00c816ce7d9235fe Mon Sep 17 00:00:00 2001 From: "Sean C. Farley" Date: Wed, 1 Feb 2012 14:43:11 -0500 Subject: [PATCH 4/4] Fix setup.py build with static/css directory Exclude static/css from package_data since package_data does not handle the copying of subdirectories implicitly to fix the build. --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 690a7e0fd..a075fcaf5 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,9 @@ setup( 'djangorestframework.runtests', 'djangorestframework.utils'], package_dir={'djangorestframework': 'djangorestframework'}, - package_data = {'djangorestframework': ['templates/*', 'static/*']}, + package_data = {'djangorestframework': ['templates/*', 'static/*', + 'static/css/*']}, + exclude_package_data = {'djangorestframework': ['static/css']}, test_suite = 'djangorestframework.runtests.runcoverage.main', install_requires=['URLObject>=0.6.0'], classifiers = [