Merge pull request #52 from aerispaha/dev

Add sections to Model.inp, style improvements, bug fix

.gitignore

@@ -17,3 +17,10 @@ _build/
 
 # IDE Stuff
 *.idea/
+
+# SWMM files
+*.out
+#*.ini
+*.chi
+*.~inp
+*.thm

MANIFEST.in

@@ -3,3 +3,7 @@ include lib/windows/swmm5_22.exe
 include lib/linux/swmm5
 include swmmio/reporting/basemaps/*.html
 include swmmio/graphics/fonts/*.ttf
+include swmmio/defs/*.json
+include swmmio/tests/data/*.inp
+include swmmio/tests/data/*.rpt
+include swmmio/tests/data/*.csv

README.md

@@ -1,4 +1,5 @@
-# SWMMIO
+# SWMMIO 
+v0.3.5
 
 [![Build status](https://ci.appveyor.com/api/projects/status/qywujm5w2wm0y2tv/branch/master?svg=true)](https://ci.appveyor.com/project/aerispaha/swmmio/branch/master) 
 [![Build Status](https://travis-ci.com/aerispaha/swmmio.svg?branch=master)](https://travis-ci.com/aerispaha/swmmio)

setup.py

@@ -7,6 +7,7 @@
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
+
 def get_version(module='swmmio'):
     """Get version."""
     with open(os.path.join(HERE, module, '__init__.py'), 'r') as f:
@@ -19,8 +20,12 @@ def get_version(module='swmmio'):
             break
     return version
 
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_description():
+    """Get long description."""
+    with open(os.path.join(HERE, 'README.md'), 'r') as f:
+        data = f.read()
+    return data
 
 
 AUTHOR_NAME = 'Adam Erispaha'
@@ -32,32 +37,36 @@ def read(fname):
     'pandas',
     'pyshp',
     'geojson',
-    ]
+]
 
 tests_require = [
     'pytest',
 ]
 
-setup(name = 'swmmio',
-      version = get_version(),
-      description = 'Tools for reading, writing, visualizing, and versioning EPA SWMM5 models.',
-      author = AUTHOR_NAME,
-      url = 'https://github.com/aerispaha/swmmio',
-      author_email = AUTHOR_EMAIL,
-      packages = find_packages(exclude = ('tests')),
-      entry_points = {
-        "console_scripts": ['swmmio_run = swmmio.run_models.run:run_simple']
-        },
-      install_requires = install_requires,
-      tests_require = tests_require,
-      long_description = read('README.rst'),
-      include_package_data = True,
-      platforms = "OS Independent",
-      license = "MIT License",
-      classifiers = [
+setup(name='swmmio',
+      version=get_version(),
+      description='Tools for interacting with, editing, and visualizing EPA SWMM5 models',
+      author=AUTHOR_NAME,
+      url='https://github.com/aerispaha/swmmio',
+      author_email=AUTHOR_EMAIL,
+      packages=find_packages(exclude=('tests')),
+      entry_points={
+          "console_scripts": ['swmmio_run = swmmio.run_models.run:run_simple']
+      },
+      install_requires=install_requires,
+      tests_require=tests_require,
+      long_description=get_description(),
+      long_description_content_type="text/markdown",
+      include_package_data=True,
+      platforms="OS Independent",
+      license="MIT License",
+      classifiers=[
           "Development Status :: 3 - Alpha",
           "License :: OSI Approved :: MIT License",
           "Operating System :: OS Independent",
           "Programming Language :: Python :: 2.7",
+          "Programming Language :: Python :: 3.6",
       ]
-)
+      )
+
+

swmmio/__init__.py

@@ -5,7 +5,7 @@
 '''Python SWMM Input/Output Tools'''
 
 
-VERSION_INFO = (0, 3, 4)
+VERSION_INFO = (0, 3, 5)
 __version__ = '.'.join(map(str, VERSION_INFO))
 __author__ = 'Adam Erispaha'
 __copyright__ = 'Copyright (c) 2016'