From: dsc Date: Wed, 21 Dec 2011 18:06:58 +0000 (-0800) Subject: Restructuring to build site. X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=7575075dbd3d567c97a1c0da2a7ccec37668638d;p=crisishaiku.git Restructuring to build site. --- diff --git a/.gitignore b/.gitignore index a5c4834..6fe101c 100644 --- 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 --- 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 new mode 100755 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 index 0000000..e69de29 diff --git a/setup.py b/setup.py index 7a6f191..ddd0fb4 100644 --- a/setup.py +++ b/setup.py @@ -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", )