fixes a buildout issue due to dev being in version name; reformatting…

… dos NL/CR crap

MANIFEST.in

@@ -1,2 +1,2 @@
-recursive-include gtfsdb/configs *
-recursive-include gtfsdb/data *
+recursive-include gtfsdb/configs *
+recursive-include gtfsdb/data *

buildout.cfg

@@ -1,26 +1,33 @@
 [buildout]
 parts = dev postgresql prod testrunner
+develop = .
+app-egg-name = gtfsdb
 newest = false
+include-site-packages = true
+allowed-eggs-from-site-packages = psycopg2 Setuptools zc.buildout
 prefer-final = true
-develop = .
 
 [dev]
 recipe = zc.recipe.egg
+dependent-scripts = true
 eggs = gtfsdb[dev]
 interpreter = python
 
 [oracle]
 recipe = zc.recipe.egg
+dependent-scripts = true
 eggs = gtfsdb[oracle]
 interpreter = python
 
 [postgresql]
 recipe = zc.recipe.egg
+dependent-scripts = true
 eggs = gtfsdb[postgresql]
 interpreter = python
 
 [prod]
 recipe = zc.recipe.egg
+dependent-scripts = true
 eggs = gtfsdb
 interpreter = python
 

gtfsdb/__init__.py

@@ -1,16 +1,16 @@
-from gtfsdb.model.agency import Agency
-from gtfsdb.model.calendar import *
-from gtfsdb.model.db import Database
-from gtfsdb.model.fare import *
-from gtfsdb.model.feed_info import FeedInfo
-from gtfsdb.model.frequency import Frequency
-from gtfsdb.model.gtfs import GTFS
-from gtfsdb.model.route import *
-from gtfsdb.model.route_stop import RouteStop
-from gtfsdb.model.shape import *
-from gtfsdb.model.stop import Stop
-from gtfsdb.model.stop_feature import *
-from gtfsdb.model.stop_time import StopTime
-from gtfsdb.model.transfer import Transfer
-from gtfsdb.model.trip import Trip
-from gtfsdb.model.block import Block
+from gtfsdb.model.agency import Agency
+from gtfsdb.model.calendar import *
+from gtfsdb.model.db import Database
+from gtfsdb.model.fare import *
+from gtfsdb.model.feed_info import FeedInfo
+from gtfsdb.model.frequency import Frequency
+from gtfsdb.model.gtfs import GTFS
+from gtfsdb.model.route import *
+from gtfsdb.model.route_stop import RouteStop
+from gtfsdb.model.shape import *
+from gtfsdb.model.stop import Stop
+from gtfsdb.model.stop_feature import *
+from gtfsdb.model.stop_time import StopTime
+from gtfsdb.model.transfer import Transfer
+from gtfsdb.model.trip import Trip
+from gtfsdb.model.block import Block

gtfsdb/configs/app.ini

@@ -1,21 +1,21 @@
-[loggers]
-keys = root
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-handlers = console
-level = DEBUG
-
-[handler_console]
-class = StreamHandler
-args = (sys.stdout,)
-formatter = generic
-
-[formatter_generic]
-datefmt = %H:%M:%S
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+handlers = console
+level = DEBUG
+
+[handler_console]
+class = StreamHandler
+args = (sys.stdout,)
+formatter = generic
+
+[formatter_generic]
+datefmt = %H:%M:%S
+format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s