cleaned and organized stuff

mtlpy · Dec 9, 2013 · 7fb8393 · 7fb8393
1 parent c0ae4b0
commit 7fb8393
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ lib/
 bin/
 include/
 data.db
-*.pyc
+*.pyc
+*.egg-info/
diff --git a/Piscine_2012-mtl.csv → python/osmtlpy/Piscine_2012-mtl.csv b/Piscine_2012-mtl.csv → python/osmtlpy/Piscine_2012-mtl.csv
diff --git a/python/osmtlpy/__init__.py b/python/osmtlpy/__init__.py
diff --git a/application.py → python/osmtlpy/application.py b/application.py → python/osmtlpy/application.py
@@ -1,3 +1,5 @@
+import sys
+
 from flask import Flask, render_template, json
 from peewee import SqliteDatabase, Model, IntegerField, CharField, FloatField
 
@@ -35,8 +37,12 @@ def piscines():
     return json.jsonify(result=data)
 
 
-if __name__ == "__main__":
+def main():
     db.connect()
     Piscine.create_table(True)
     app.debug = True
     app.run()
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/...et_02_bibliotheques/bibliotheques.geojson → ...et_02_bibliotheques/bibliotheques.geojson b/...et_02_bibliotheques/bibliotheques.geojson → ...et_02_bibliotheques/bibliotheques.geojson
diff --git a/...t_02_bibliotheques/images/library-512.png → ...t_02_bibliotheques/images/library-512.png b/...t_02_bibliotheques/images/library-512.png → ...t_02_bibliotheques/images/library-512.png
diff --git a/leaflet_02_bibliotheques/images/library.png → ...aflet_02_bibliotheques/images/library.png b/leaflet_02_bibliotheques/images/library.png → ...aflet_02_bibliotheques/images/library.png
diff --git a/...et_02_bibliotheques/images/[email protected] → ...et_02_bibliotheques/images/[email protected] b/...et_02_bibliotheques/images/[email protected] → ...et_02_bibliotheques/images/[email protected]
diff --git a/leaflet_02_bibliotheques/index.html → ...mtlpy/leaflet_02_bibliotheques/index.html b/leaflet_02_bibliotheques/index.html → ...mtlpy/leaflet_02_bibliotheques/index.html
diff --git a/leaflet_02_bibliotheques/map.js → ...n/osmtlpy/leaflet_02_bibliotheques/map.js b/leaflet_02_bibliotheques/map.js → ...n/osmtlpy/leaflet_02_bibliotheques/map.js
diff --git a/leaflet_02_bibliotheques/style.css → ...smtlpy/leaflet_02_bibliotheques/style.css b/leaflet_02_bibliotheques/style.css → ...smtlpy/leaflet_02_bibliotheques/style.css
diff --git a/scripts.py → python/osmtlpy/scripts.py b/scripts.py → python/osmtlpy/scripts.py
diff --git a/static/bibliotheques.geojson → python/osmtlpy/static/bibliotheques.geojson b/static/bibliotheques.geojson → python/osmtlpy/static/bibliotheques.geojson
diff --git a/static/images/library-512.png → python/osmtlpy/static/images/library-512.png b/static/images/library-512.png → python/osmtlpy/static/images/library-512.png
diff --git a/static/images/library.png → python/osmtlpy/static/images/library.png b/static/images/library.png → python/osmtlpy/static/images/library.png
diff --git a/static/images/[email protected] → python/osmtlpy/static/images/[email protected] b/static/images/[email protected] → python/osmtlpy/static/images/[email protected]
diff --git a/static/map.js → python/osmtlpy/static/map.js b/static/map.js → python/osmtlpy/static/map.js
diff --git a/static/style.css → python/osmtlpy/static/style.css b/static/style.css → python/osmtlpy/static/style.css
diff --git a/templates/index.html → python/osmtlpy/templates/index.html b/templates/index.html → python/osmtlpy/templates/index.html
diff --git a/python/setup.py b/python/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup, find_packages
+
+setup(
+    name='osmtlpy',
+    include_package_data=True,
+    packages=find_packages(exclude=['ez_setup']),
+    install_requires=[
+        "Flask",
+        "peewee",
+    ],
+    entry_points="""
+    [console_scripts]
+    osmtlpy = osmtlpy.application:main
+    """)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,5 @@ lib/ @@
     bin/
     include/
     data.db
-    *.pyc
+    *.pyc
+    *.egg-info/