Skip to content
This repository has been archived by the owner on Sep 14, 2021. It is now read-only.

Commit

Permalink
Finally fix packaging problems after moving playbooks to package-loca…
Browse files Browse the repository at this point in the history
…l directory.
  • Loading branch information
riccardomurri committed May 10, 2016
1 parent cc54eee commit e7e0ec4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
recursive-include elasticluster/share/playbooks *
recursive-include elasticluster/share *
recursive-include docs *
include elasticluster README.rst version.txt

2 changes: 1 addition & 1 deletion docs/configure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ compute nodes. Your configuration will thus look like::
flavor=bigdisk


.. _`template configuration file`: https://raw.github.com/gc3-uzh-ch/elasticluster/master/docs/config.template
.. _`template configuration file`: https://raw.github.com/gc3-uzh-ch/elasticluster/master/elasticluster/share/etc/config.template

Storage section
===============
Expand Down
File renamed without changes.
18 changes: 2 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,6 @@ def read_file_lines(path):
return [line for line in lines
if line != '' and not line.startswith('#')]

PLAYBOOKS_SRC_DIR = 'elasticluster/share/playbooks'

def playbook_files():
basedir = os.path.dirname(__file__)
ansible_files = []
for current_dir, dir_entries, file_entries in os.walk(PLAYBOOKS_SRC_DIR):
file_resources = []
for filename in file_entries:
if filename.startswith('.git'):
continue
file_resources.append(os.path.join(current_dir, filename))
ansible_files.append((os.path.join('share', current_dir), file_resources))
return ansible_files


## state run-time dependencies
#
Expand Down Expand Up @@ -152,7 +138,7 @@ def run_tests(self):
name="elasticluster",
version=read_whole_file("version.txt"),
description="A command line tool to create, manage and setup computing clusters hosted on a public or private cloud infrastructure.",
long_description=open('README.rst').read(),
long_description=read_whole_file('README.rst'),
author="Services and Support for Science IT, University of Zurich",
author_email="[email protected]",
license="LGPL",
Expand Down Expand Up @@ -180,7 +166,7 @@ def run_tests(self):
],
packages=find_packages(),
install_requires=required_packages,
data_files=([('share/etc', ['docs/config.template'])] + playbook_files()),
include_package_data=True, # include files mentioned by MANIFEST.in
entry_points={
'console_scripts': [
'elasticluster = elasticluster.main:main',
Expand Down

0 comments on commit e7e0ec4

Please sign in to comment.