Merge pull request #58 from rolobio/feature/type-hinting

Feature/type hinting

.gitignore

@@ -8,7 +8,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
+env
 env2/
 build/
 develop-eggs/
@@ -83,6 +83,7 @@ celerybeat-schedule
 venv/
 ENV/
 
+
 # Spyder project settings
 .spyderproject
 

.travis.yml

@@ -1,42 +1,52 @@
 os:
-    - linux
+  - linux
+dist: xenial  # for Python 3.7
 language: python
 python:
-    - "2.7"
-    - "3.4"
-    - "3.5"
-    - "3.6"
+  - "3.6"
+  - "3.7"
+  - "3.7-dev"
+cache: pip
 env:
-    - PG_VERSION=9.2
-    - PG_VERSION=9.3
-    - PG_VERSION=9.4
-    - PG_VERSION=9.5
-    - PG_VERSION=9.6
+  - PG_VERSION=9.2
+  - PG_VERSION=9.3
+  - PG_VERSION=9.4
+  - PG_VERSION=9.5
+  - PG_VERSION=9.6
+  - PG_VERSION=10
+addons:
+  postgresql: "10"
+  apt:
+    packages:
+      - postgresql-10
+      - postgresql-client-10
 before_install:
-    # Stop any postgres, then start a specific version of postgres to test against
-    - sudo service postgresql stop && sudo service postgresql start $PG_VERSION
+  # Copy postgres config for version 10
+  - sudo cp /etc/postgresql/{9.6,10}/main/pg_hba.conf
+  # Stop any postgres, then start a specific version of postgres to test against
+  - sudo service postgresql stop && sudo service postgresql start $PG_VERSION
 install:
-    - "pip install -e .[testing]"
+  - "pip install -e .[testing]"
 before_script:
-    - psql -c 'create database dictorm;' -U postgres
+  - psql -c 'create database dictorm;' -U postgres
 script:
-    # Run tests verbosely, with coverage
-    - "green -rvv"
-    # Test installation
-    - "python setup.py install"
-    #  Verify that dictorm can be imported
-    - "python -c 'from dictorm import *'"
+  # Run tests verbosely, with coverage
+  - "green -rvv"
+  # Test installation
+  - "python setup.py install"
+  # Verify that dictorm can be imported
+  - "python -c 'from dictorm import *'"
 services:
-    - postgresql
+  - postgresql
 after_success:
-    # Submit coverage report to coveralls
-    - coveralls
-    # Run profiler
-    - time python ./profiler.py
+  # Submit coverage report to coveralls
+  - coveralls
+  # Run profiler
+  - time python ./profiler.py
 deploy:
   provider: pypi
   user: rolobio
-  password:
-    secure: vQdc1p4zDA87PVcr6/vD2lH9hBltJbF+9O0UhTH2EGpMOgB+Fm69YXRnkbBg2La2yQsXDHpNyXCi0SR0vw8+z+ufDMgTux4yTZS5rpnR1lJVuV+p1ANSk9s6Pn6So+3OL2jl45FMwcjb3MDhr1Qx7Ot7VhtI7ZqcCXv3fWGdpaPtfdWBFZA4u7g0jmEswBDAIOnnda7uKJWLaXIshhqt4R5FKNWPidGUuiN0ZPe2n69C3gx9PBqHEuLPCOA74waG4F7d/1bavfe2sOgZJGFtUevyWpuxb53lxQ49VjYKn4li78VonwzgJxJSXt7ABiURHi4osTlCwyhOnvEor+vIb6DEIgUuFCDpqONY9gijh7mMk2jvf87hy2Pi7DQJnap5riJ0KRL3DaXLwEm4k+mjL2nAnXiCjTWgIWjC3+wXQwqrQ1dhhLcYItwgQNRyAkJEQ6lYfLgKzx3wO+TAurb6ET3/aFLBM8x4Xop3fItF/IZdCOSn3BU2I8mWKXcEaZp3REw97+sfJ7XbZ5ni/TXPsqJfWCNyLM2Z23mlwSWfvouGJnN0vRZptlbimTeOtzyidBT3JnvvQ6lyD60QzwrUziQ+4G6jC+ZeQjZh2qy6W8/T/V9loT9xdYjGzJyzXAKE2iyohiyBB4N6ve/zazTmlfgb8klXvUgpNO8X3AT+5IA=
   on:
     tags: true
+  password:
+    secure: l3qUamczpqrBejHBPTuDOGTYtDQeKymhmwa252b8QNZjI3St46j8o+F6cnCTfzLW51U17+83CwKEUqKRGGkZE2iWGy3aflghgSdeDI09d/jnEfQRCPs9SpfK9dntOJkJfPnVPY4VXWsIexgK9CsN7FDaBtqpXZLOIzbAqsERgPiYbH5n1yNj6qh8JaYBiTajyTKbuk2cXLCpgEI0OVyFvVDbLla5HVnxGcEOkCbaizUYwb0FxMCMeH0prDB/jqrI7yFXhplD0yYfoo+HG9ec8BoBvxBjxemZ/zyjEoCljeKjXr4NLDnSCWpbaa89KJoMPMQUV7IffXp9S5TDyJ+QLItoglk/NabbMOuRchlbL31b9UhyDcqCiVpgIAjOKbDWL0TDoUbf6avzafQ2u0K3Ivi+28HXKvWFtF0zFGPwJbWFm3G6PTxynBtWmsBmhAAKNb68hRugOqA72aOcsbNEBlJ6g8A0ULhwrP6y1SOMJl8lS6iA8zG+xWY5BUczvDyS0bt7UUjxxRAuEkRrqcu46kGUgW/PK1nLtEVZi2gHEQv1s/h7Pdp7904wk6ce9hyVf22X9fgSkzYEvnQQP3ukB+IsO0qu51dbYugKfgtJfkSBhLRd8rAi1MfD6x1eCfj/60Ai3E0UGi/HjRKbfI1Il9UmVXfcaUqccSAJwMRYLlA=

dictorm/__init__.py

@@ -1,4 +1,2 @@
-try:  # pragma: no cover
-    from dictorm.dictorm import *  # pragma: no cover
-except ImportError:  # pragma: no cover
-    from .dictorm import *  # pragma: no cover
+from .dictorm import *
+from .pg import Or