Restructuring to build site.

diff --git a/.gitignore b/.gitignore
index a5c4834..6fe101c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,23 @@
 .DS_Store
 Icon?
+
 *~
+*.pid
+*.db
+*.sqlite
+
 pip-log.txt
 *.py[oc]
 *.egg-info
+
+node_modules/
+node_modules/*
+npm-debug.log
+*.sass-cache
+lib-cov
+test/*.log
+test/fixtures/*.json
+test/fixtures/logs/*.log
+
 tmp
 var

diff --git a/README.md b/README.md
index f1a131b..01532de 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # Financial Crisis Haiku
 
+Did you know that the Financial Crisis Inquiry Report increased the US Gross National Haiku Quotient by 1.8%, the largest single increase every affected by a congressional report?

diff --git a/crisishaiku.py b/bin/find_haiku.py
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from crisishaiku.py
rename to bin/find_haiku.py

diff --git a/crisishaiku/__init__.py b/crisishaiku/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/data/Financial Crisis Inquiry Report, The - Unknown.jpg b/public/img/fcic-cover.jpg
index 7a6f191dcf65368d5caf3de843b26b6068c07e48..ddd0fb4e79135735225d36c561e57030ab60ce30 100644 (file)
--- a/data/Financial Crisis Inquiry Report, The - Unknown.jpg
+++ b/public/img/fcic-cover.jpg
@@ -1,37 +1,33 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
 from setuptools import setup, find_packages
 from os.path import dirname, abspath, join
-from financial-crisis-haiku import __version__
+
+from crisishaiku import __version__
 
 HERE = abspath(dirname(__file__))
-with open(join(HERE, 'README.md'), 'rU') as f:
-    readme = f.read()
+readme = open(join(HERE, 'README.md'), 'rU').read()
 
 
 setup(
-    name             = 'financial-crisis-haiku',
+    name             = 'crisishaiku',
     version          = __version__,
-    description      = 'financial-crisis-haiku',
+    description      = 'crisishaiku.com website',
     long_description = readme,
-    url              = 'http://github/dsc/financial-crisis-haiku',
+    url              = 'http://crisishaiku.com/',
     
     author           = 'David Schoonover',
     author_email     = 'dsc@less.ly',
     
-    packages         = find_packages('.', exclude=['ez_setup']),
-    # py_modules       = [ 'financial-crisis-haiku', ],
-    # packages         = [ 'financial-crisis-haiku', ],
-    # entry_points     = { 'console_scripts':['financial-crisis-haiku = financial-crisis-haiku:Financial-crisis-haiku.main'] },
+    packages         = find_packages(),
+    # entry_points     = { 'console_scripts':['crisishaiku = crisishaiku:CrisisHaiku.main'] },
     
     install_requires = [
         "bunch  >= 1.0",
         "PyYAML >= 3.10",
-        "PyHyphen >= 1.0",
     ],
     
-    keywords         = [ 'financial-crisis-haiku', ],
+    keywords         = 'crisishaiku crisis haiku poetry web',
     classifiers      = [
         "Development Status :: 4 - Beta",
         "Environment :: Console",
@@ -44,6 +40,6 @@ setup(
         "Operating System :: OS Independent",
         "License :: OSI Approved :: MIT License",
     ],
-    zip_safe = True,
+    zip_safe = False,
     license  = "MIT",
 )

diff --cc setup.py
Simple merge