Merge pull request #48 from aerispaha/geojson

Improved import pattern, coordinate ref system support

.gitignore

@@ -14,3 +14,6 @@ __pycache__/
 .cache/
 .pytest_cache/
 _build/
+
+# IDE Stuff
+*.idea/

.travis.yml

@@ -2,7 +2,13 @@ language: python
 python:
   - "2.7"
   - "3.6"
-  # - "3.7"
+
+# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 # command to install dependencies
 install:
   - pip install -r requirements.txt

README.md

@@ -98,7 +98,7 @@ For example, climate change impacts can be investigated by creating a set of mod
 import os, shutil
 import swmmio
 from swmmio.utils.modify_model import replace_inp_section
-from swmmio.utils.dataframes import create_dataframeINP
+from swmmio import create_dataframeINP
 
 #initialize a baseline model object
 baseline = swmmio.Model(r'path\to\baseline.inp')

swmmio/__init__.py

@@ -1,10 +1,12 @@
+from swmmio import *
+from swmmio.utils.dataframes import create_dataframeBI, create_dataframeRPT, create_dataframeINP
+from .core import *
+import swmmio.core as swmmio
 '''Python SWMM Input/Output Tools'''
 
 
-VERSION_INFO = (0, 3, 2)
+VERSION_INFO = (0, 3, 4)
 __version__ = '.'.join(map(str, VERSION_INFO))
 __author__ = 'Adam Erispaha'
 __copyright__ = 'Copyright (c) 2016'
 __licence__ = ''
-
-from .swmmio import *