External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-01 18:39:54 -02:30
Code Issues Packages Projects Releases Wiki Activity

Switch to dh-python2 and remove py files during packaging

Browse Source
This commit is contained in:
James Laska
2014-10-19 15:05:54 -04:00
parent 3512b93c17
commit 5d4444235a
2 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -276,7 +276,7 @@ release_clean:
-(rm -rf ($RELEASE)) -(rm -rf ($RELEASE))
dist/$(SDIST_TAR_FILE): dist/$(SDIST_TAR_FILE):
BYTE_COMPILE=$(BYTE_COMPILE) BUILD="$(BUILD)" $(PYTHON) setup.py sdist BUILD="$(BUILD)" $(PYTHON) setup.py sdist
sdist: minjs dist/$(SDIST_TAR_FILE) sdist: minjs dist/$(SDIST_TAR_FILE)
@@ -321,7 +321,6 @@ deb-build/$(SDIST_TAR_NAME):
cp -a packaging/debian deb-build/$(SDIST_TAR_NAME)/ cp -a packaging/debian deb-build/$(SDIST_TAR_NAME)/
sed -ie "s#^$(NAME) (\([^)]*\)) \([^;]*\);#$(NAME) ($(VERSION)-$(DEB_RELEASE)) $(DEB_DIST);#" deb-build/$(SDIST_TAR_NAME)/debian/changelog sed -ie "s#^$(NAME) (\([^)]*\)) \([^;]*\);#$(NAME) ($(VERSION)-$(DEB_RELEASE)) $(DEB_DIST);#" deb-build/$(SDIST_TAR_NAME)/debian/changelog
# debian: BYTE_COMPILE = 1
debian: sdist deb-build/$(SDIST_TAR_NAME) debian: sdist deb-build/$(SDIST_TAR_NAME)
deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb: deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb:

8
setup.py
View File

@@ -125,8 +125,9 @@ class sdist_pyc_only(_sdist, object):
##################################################################### #####################################################################
from distutils.command.install_lib import install_lib as _install_lib if os.getenv('RPM_PACKAGE_NAME', False) == 'ansible-tower':
from distutils.command.install_lib import install_lib as _install_lib
class install_lib(_install_lib, object): class install_lib(_install_lib, object):
''' '''
Custom install_lib command to distribute some files as .pyc only. Custom install_lib command to distribute some files as .pyc only.
@@ -167,6 +168,9 @@ class install_lib(_install_lib, object):
filenames = super(install_lib, self).get_outputs() filenames = super(install_lib, self).get_outputs()
return [filename for filename in filenames return [filename for filename in filenames
if not filename.endswith('.py')] if not filename.endswith('.py')]
else:
from distutils.command.install_lib import install_lib
##################################################################### #####################################################################
@@ -237,7 +241,7 @@ setup(
}, },
}, },
cmdclass = { cmdclass = {
'sdist': os.getenv('BYTE_COMPILE', False) in (True, 1, 'True', '1') and sdist_pyc_only or _sdist, 'sdist': _sdist,
'install_lib': install_lib, 'install_lib': install_lib,
}, },
) )