Merge pull request #27 from aerispaha/config_fix

moved definitions.py to swmmio.def.config, added pytest

.gitignore

@@ -8,3 +8,7 @@ private/
 /*.egg-info
 notes/
 .DS_Store
+notebooks/
+__pycache__/
+.cache/
+.pytest_cache/

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+python:
+  - "2.7"
+  # - "3.6"
+  # - "3.7"
+# command to install dependencies
+install:
+  - pip install -r requirements.txt
+# command to run tests
+script:
+  - pytest

requirements.txt

@@ -0,0 +1,9 @@
+# Build dependencies
+#python
+pytest
+pillow==3.0.0
+numpy
+pandas
+pyshp
+geojson
+# Run dependencies

setup.py

@@ -6,7 +6,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-VERSION = '0.2.0'
+VERSION = '0.2.1'
 AUTHOR_NAME = 'Adam Erispaha'
 AUTHOR_EMAIL = '[email protected]'
 
@@ -18,22 +18,27 @@ def read(fname):
     'geojson',
     ]
 
-setup(name='swmmio',
-      version=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')),
+tests_require = [
+    'pytest',
+]
+
+setup(name = 'swmmio',
+      version = 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,
-      long_description=read('README.rst'),
-      include_package_data=True,
-      platforms="OS Independent",
-      license="MIT License",
-      classifiers=[
+      install_requires = install_requires,
+      tests_require = tests_require,
+      long_description = read('README.rst'),
+      include_package_data = True,
+      platforms = "OS Independent",
+      license = "MIT License",
+      classifiers = [
           "Development Status :: 3 - Alpha",
           "License :: OSI Approved :: MIT License",
           "Operating System :: OS Independent",

swmmio/graphics/__init__.py

@@ -1,4 +1,4 @@
-from definitions import FONT_PATH
+from swmmio.defs.config import FONT_PATH
 
 class _dotdict(dict):
     """dot.notation access to dictionary attributes"""

swmmio/graphics/options.py

@@ -1,4 +1,4 @@
-from definitions import PARCEL_FEATURES, GEODATABASE
+from swmmio.defs.config import PARCEL_FEATURES, GEODATABASE
 from constants import *
 
 font_file = r"C:\Data\Code\Fonts\Raleway-Regular.ttf"

swmmio/graphics/swmm_graphics.py

@@ -1,5 +1,5 @@
 #graphical functions for SWMM files
-from definitions import *
+from swmmio.defs.config import *
 from swmmio.damage import parcels as pdamage
 from swmmio.graphics import config, options
 from swmmio.graphics.constants import * #constants

swmmio/reporting/batch.py

@@ -9,7 +9,7 @@
 import shutil
 import math
 from itertools import chain
-from definitions import *
+from swmmio.defs.config import *
 import pandas as pd
 
 

swmmio/reporting/reporting.py

@@ -14,7 +14,7 @@
 import os
 import math
 import pandas as pd
-from definitions import *
+from swmmio.defs.config import *
 import json, geojson
 import shutil
 

swmmio/reporting/serialize.py

@@ -5,7 +5,7 @@
 from swmmio.utils import spatial
 from swmmio.graphics import swmm_graphics as sg
 from swmmio.reporting.reporting import FloodReport
-from definitions import *
+from swmmio.defs.config import *
 import geojson
 
 

swmmio/reporting/utils.py

@@ -1,4 +1,4 @@
-from definitions import *
+from swmmio.defs.config import *
 import shutil
 
 #THIS STUFF IS INCOMPLETE/ MAYBE BROKEN

swmmio/reporting/visualize.py

@@ -1,7 +1,7 @@
 import os, shutil
 import pandas as pd
 from swmmio.version_control.inp import INPDiff
-from definitions import *
+from swmmio.defs.config import *
 
 
 def create_map(model1, model2=None, bbox=None, crs=None, filename=None,

swmmio/run_models/run.py

@@ -6,7 +6,7 @@
 from swmmio.utils import dataframes
 from swmmio.run_models import defs
 from swmmio.swmmio import Model
-from definitions import SWMM_ENGINE_PATH
+from swmmio.defs.config import SWMM_ENGINE_PATH
 
 
 #path to the SWMM5 Engine

swmmio/swmmio.py

@@ -10,7 +10,7 @@
 import geojson
 from .utils import text as txt
 from .utils.dataframes import create_dataframeINP, create_dataframeRPT, get_link_coords
-from definitions import *
+from .defs.config import *
 
 class Model(object):
 

swmmio/tests/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright (c) 2018 Adam Erispaha
+#
+# Licensed under the terms of the BSD2 License
+# See LICENSE.txt for details
+# -----------------------------------------------------------------------------
+"""Main tests for the swmmio"""