Browse files

making sure template.json goes into package_data

  • Loading branch information...
1 parent a1cf16c commit e0c62100104084759c2208c9fd9a6e937634eba7 Dave McLain committed Jul 26, 2011
View
2 MANIFEST.in
@@ -1,5 +1,5 @@
include README.rst
include package.json
include armstrong/cli/templates/standard/requirements/*.txt
-recursive-include armstrong/cli/templates/ * manifest.json
+include armstrong/cli/templates/standard/template.json
prune build/*
View
2 armstrong/cli/main.py
@@ -87,7 +87,7 @@ def source_files():
return -1
template_paths = []
- with open(template_dir + '/manifest.json', 'r') as manifest_file:
+ with open(template_dir + '/template.json', 'r') as manifest_file:
manifest = json.load(manifest_file)
paths = manifest.get('templated', {}).get('include', [])
template_paths = [re.compile(path) for path in paths]
View
6 armstrong/cli/templates/standard/config/development.py
@@ -7,13 +7,13 @@
# Change this to work with your default development database
DATABASES = {
'default': {
- {% if demo %}
+ #{% if demo %}
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
'NAME': './_demo/demo_database.sqlite3', # Or path to database file if using sqlite3.
- {% else %}
+ #{% else %}
'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
'NAME': '', # Or path to database file if using sqlite3.
- {% endif %}
+ #{% endif %}
'USER': '', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
View
0 ...rong/cli/templates/standard/manifest.json → ...rong/cli/templates/standard/template.json
File renamed without changes.
View
16 setup.py
@@ -54,7 +54,6 @@ def generate_namespaces(package):
if root_dir:
os.chdir(root_dir)
-
def build_package(dirpath, dirnames, filenames):
# Ignore dirnames that start with '.'
for i, dirname in enumerate(dirnames):
@@ -65,13 +64,14 @@ def build_package(dirpath, dirnames, filenames):
if os.path.altsep:
pkg = pkg.replace(os.path.altsep, '.')
packages.append(pkg)
- elif filenames:
- # Strip off the length of the package name plus the trailing slash
- prefix = dirpath[len(info["name"]) + 1:]
- for f in filenames:
- # Ignore all dot files and any compiled
- if f.startswith(".") or f.endswith(".pyc"):
- continue
+ # Strip off the length of the package name plus the trailing slash
+ prefix = dirpath[len(info["name"]) + 1:]
+ for f in filenames:
+ # Ignore all dot files and any compiled
+ if f == 'steps.py' or \
+ not (f.startswith(".") or
+ f.endswith(".pyc") or
+ f.endswith(".py")):
data_files.append(os.path.join(prefix, f))

0 comments on commit e0c6210

Please sign in to comment.