From c5b0d34c48024e539696c22c4bb8e7d2451f861d Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Fri, 24 Nov 2017 21:33:01 -0500 Subject: [PATCH 1/2] Packaging should use manifest --- setup.py | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/setup.py b/setup.py index 3854130528..736df7b129 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ import sys from io import open -from setuptools import setup +from setuptools import setup, find_packages try: from pypandoc import convert @@ -28,31 +28,6 @@ def get_version(package): return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1) -def get_packages(package): - """ - Return root package and all sub-packages. - """ - return [dirpath - for dirpath, dirnames, filenames in os.walk(package) - if os.path.exists(os.path.join(dirpath, '__init__.py'))] - - -def get_package_data(package): - """ - Return all files under the root package, that are not in a - package themselves. - """ - walk = [(dirpath.replace(package + os.sep, '', 1), filenames) - for dirpath, dirnames, filenames in os.walk(package) - if not os.path.exists(os.path.join(dirpath, '__init__.py'))] - - filepaths = [] - for base, filenames in walk: - filepaths.extend([os.path.join(base, filename) - for filename in filenames]) - return {package: filepaths} - - version = get_version('rest_framework') @@ -84,8 +59,8 @@ def get_package_data(package): long_description=read_md('README.md'), author='Tom Christie', author_email='tom@tomchristie.com', # SEE NOTE BELOW (*) - packages=get_packages('rest_framework'), - package_data=get_package_data('rest_framework'), + packages=find_packages(exclude=['tests*']), + include_package_data=True, install_requires=[], zip_safe=False, classifiers=[ From 5efd7aa24e9526a37d2f0da040a2e74a2c6ad9c2 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Fri, 24 Nov 2017 21:34:06 -0500 Subject: [PATCH 2/2] Add schema.js template to MANIFEST --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 15bfe4caac..48ec57edf7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include README.md include LICENSE.md recursive-include rest_framework/static *.js *.css *.png *.eot *.svg *.ttf *.woff -recursive-include rest_framework/templates *.html +recursive-include rest_framework/templates *.html schema.js global-exclude __pycache__ global-exclude *.py[co] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy