Removal of include_package_data

pyscaffold · Mar 19, 2015 · 5e7aed7 · 5e7aed7
1 parent bed573c
commit 5e7aed7
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 39 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,7 +7,6 @@ Version 2.1, 2015-??-??
 
 - Use alabaster as default Sphinx theme
 - Automatically install Sphinx if necessary
-- Added `include_package_data` again with support of `setuptools-git`
 
 Version 2.0.4, 2015-03-17
 =========================

diff --git a/pyscaffold/data/setup_cfg.template b/pyscaffold/data/setup_cfg.template
@@ -4,9 +4,6 @@ author = ${author}
 author_email = ${email}
 license = ${license}
 url = ${url}
-# Include all additional data INSIDE your package AND tracked by git?
-# If true this will install `setuptools-git` if not provided
-include_package_data = false
 # Comma separated list of data INSIDE your package to include.
 # DO NOT prepend the package name when specifying files and folders.
 package_data = 

diff --git a/pyscaffold/data/setup_py.template b/pyscaffold/data/setup_py.template
@@ -115,10 +115,6 @@ def read_setup_cfg():
     metadata['classifiers'] = [item.strip() for item in classifiers.split(',')]
     console_scripts = dict(config.items('console_scripts'))
     console_scripts = prepare_console_scripts(console_scripts)
-    include_package_data_bool = metadata.get('include_package_data', 'false')
-    metadata['include_package_data'] = str2bool(include_package_data_bool)
-    if metadata['include_package_data']:
-        Distribution().fetch_build_eggs(['setuptools-git'])
     package_data = metadata.get('package_data', '')
     package_data = [item.strip() for item in package_data.split(',') if item]
     metadata['package_data'] = package_data
@@ -529,7 +525,6 @@ def setup_package():
           setup_requires=['six'],
           cmdclass=cmdclass,
           tests_require=['pytest-cov', 'pytest'],
-          include_package_data=metadata['include_package_data'],
           package_data={package: metadata['package_data']},
           data_files=[('.', metadata['data_files'])],
           command_options=command_options,

diff --git a/setup.cfg b/setup.cfg
@@ -4,9 +4,6 @@ author = Florian Wilhelm
 author_email = Florian.Wilhelm@blue-yonder.com
 license = new BSD
 url = http://pyscaffold.readthedocs.org/
-# Include all additional data INSIDE your package AND tracked by git?
-# If true this will install `setuptools-git` if not provided
-include_package_data = false
 # Comma separated list of data INSIDE your package to include.
 # DO NOT prepend the package name when specifying files and folders.
 package_data = data/*

diff --git a/setup.py b/setup.py
@@ -114,10 +114,6 @@ def read_setup_cfg():
     metadata['classifiers'] = [item.strip() for item in classifiers.split(',')]
     console_scripts = dict(config.items('console_scripts'))
     console_scripts = prepare_console_scripts(console_scripts)
-    include_package_data_bool = metadata.get('include_package_data', 'false')
-    metadata['include_package_data'] = str2bool(include_package_data_bool)
-    if metadata['include_package_data']:
-        Distribution().fetch_build_eggs(['setuptools-git'])
     package_data = metadata.get('package_data', '')
     package_data = [item.strip() for item in package_data.split(',') if item]
     metadata['package_data'] = package_data
@@ -528,7 +524,6 @@ def setup_package():
           setup_requires=['six'],
           cmdclass=cmdclass,
           tests_require=['pytest-cov', 'pytest'],
-          include_package_data=metadata['include_package_data'],
           package_data={package: metadata['package_data']},
           data_files=[('.', metadata['data_files'])],
           command_options=command_options,

diff --git a/tests/demoapp/setup.cfg b/tests/demoapp/setup.cfg
@@ -4,15 +4,8 @@ author = Florian Wilhelm
 author_email = Florian.Wilhelm@blue-yonder.com
 license = new BSD
 url = http://...
-# Include all additional data inside your package?
-include_package_data = false
-# Comma separated list of data inside your package to include
 package_data =
-# Comma separated list of data outside your package to include
-# Equivalent to adding files to MANIFEST.in
 data_files = *.rst, *.txt
-# Add here all kinds of additional classifiers as defined under
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 classifiers = Development Status :: 5 - Production/Stable,
               Topic :: Utilities,
               Programming Language :: Python,
@@ -28,16 +21,12 @@ classifiers = Development Status :: 5 - Production/Stable,
               Operating System :: Microsoft :: Windows
 
 [console_scripts]
-# Add here console scripts like:
-# hello_world = pyscaffold.module:function
 demoapp = demoapp.runner:run
 
 [test]
-# html, xml or annotate
 cov-report = html
 junitxml = junit.xml
 
-# Options for pytest
 [pytest]
 flakes-ignore =
     doc/conf.py ALL

diff --git a/tests/demoapp_data/setup.cfg b/tests/demoapp_data/setup.cfg
@@ -4,15 +4,8 @@ author = Florian Wilhelm
 author_email = Florian.Wilhelm@blue-yonder.com
 license = new BSD
 url = http://...
-# Include all additional data inside your package?
-include_package_data = false
-# Comma separated list of data inside your package to include
 package_data = data/*
-# Comma separated list of data outside your package to include
-# Equivalent to adding files to MANIFEST.in
 data_files = *.rst, *.txt
-# Add here all kinds of additional classifiers as defined under
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 classifiers = Development Status :: 5 - Production/Stable,
               Topic :: Utilities,
               Programming Language :: Python,
@@ -28,16 +21,12 @@ classifiers = Development Status :: 5 - Production/Stable,
               Operating System :: Microsoft :: Windows
 
 [console_scripts]
-# Add here console scripts like:
-# hello_world = pyscaffold.module:function
 demoapp_data = demoapp_data.runner:run
 
 [test]
-# html, xml or annotate
 cov-report = html
 junitxml = junit.xml
 
-# Options for pytest
 [pytest]
 flakes-ignore =
     doc/conf.py ALL