Skip to content

Commit

Permalink
Fix packaging (#5624)
Browse files Browse the repository at this point in the history
* Packaging should use manifest

* Add schema.js template to MANIFEST
  • Loading branch information
Ryan P Kilby authored and carltongibson committed Nov 27, 2017
1 parent fc94fbd commit abef84f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 29 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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]
31 changes: 3 additions & 28 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')


Expand Down Expand Up @@ -84,8 +59,8 @@ def get_package_data(package):
long_description=read_md('README.md'),
author='Tom Christie',
author_email='[email protected]', # 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=[
Expand Down

0 comments on commit abef84f

Please sign in to comment.