Skip to content

Commit

Permalink
Remove duplicated content from wheel packages. Fix #114
Browse files Browse the repository at this point in the history
  • Loading branch information
aarranz committed Jan 21, 2016
1 parent 28d1bba commit eea4a50
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
1 change: 1 addition & 0 deletions src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
*.mo
*.db
*.egg-info
*.DS_Store
5 changes: 3 additions & 2 deletions src/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ include LICENSE
include MANIFEST.in
recursive-include wirecloud *
recursive-exclude * __pycache__
recursive-exclude wirecloud *.py[co]
recursive-exclude wirecloud *.po
global-exclude *.py[co]
global-exclude *.po
global-exclude .DS_Store
prune wirecloud/guidebuilder
20 changes: 0 additions & 20 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,9 @@
from distutils.command.build import build as distutils_build
from setuptools.command.install import install as setuptools_install
from setuptools.command.sdist import sdist as setuptools_sdist
import sys

import wirecloud.platform

ROOT = os.path.abspath(os.path.dirname(__file__))
packages, data_files = [], []


class bcolors:
HEADER = '\033[95m'
OKBLUE = '\033[94m'
Expand Down Expand Up @@ -121,20 +116,6 @@ def run(self):
scheme['data'] = scheme['purelib']


def include_data_files(path, exclude):
exclude = re.compile(exclude)
for dirpath, dirnames, filenames in os.walk(path):
# Ignore dirnames that start with '.'
for i, dirname in enumerate(dirnames):
if dirname.startswith('.') or dirname in ("__pycache__", "guidebuilder"):
del dirnames[i]
if '__init__.py' not in filenames:
data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames if not exclude.match(f)]])

data_files.append(['wirecloud', ['LICENSE']])
include_data_files('wirecloud', exclude=".*\.(py[co]|po)")


setup(
name='wirecloud',
version=wirecloud.platform.__version__,
Expand All @@ -151,7 +132,6 @@ def include_data_files(path, exclude):
),
},
include_package_data=True,
data_files=data_files,
install_requires=(
'Django>=1.5,<1.10',
'south>=1.0,<2.0',
Expand Down

0 comments on commit eea4a50

Please sign in to comment.