Merging

Author: sreeder

.travis.yml

@@ -34,6 +34,7 @@ addons:
       - e2fsprogs
       - mysql-client
       - libproj-dev
+
 #  mariadb: '10.1'
 before_script:
   - ./scripts/tests/mysql_setup.sh
@@ -55,5 +56,6 @@ install: # now just our code
 
 # command to run tests
 script:
+
   - py.test
 

psycopg2/bld.bat

@@ -0,0 +1,8 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+:: See
+:: http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.

psycopg2/build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+$PYTHON setup.py install
+
+# Add more build steps here, if they are necessary.
+
+# See
+# http://docs.continuum.io/conda/build.html
+# for a list of environment variables that are set during the build process.

psycopg2/meta.yaml

@@ -0,0 +1,60 @@
+package:
+  name: psycopg2
+  version: "2.6.1"
+
+source:
+  fn: psycopg2-2.6.1.tar.gz
+  url: https://pypi.python.org/packages/86/fd/cc8315be63a41fe000cce20482a917e874cdc1151e62cb0141f5e55f711e/psycopg2-2.6.1.tar.gz
+  md5: 842b44f8c95517ed5b792081a2370da1
+#  patches:
+   # List any patch files here
+   # - fix.patch
+
+# build:
+  # preserve_egg_dir: True
+  # entry_points:
+    # Put any entry points (scripts to be generated automatically) here. The
+    # syntax is module:function.  For example
+    #
+    # - psycopg2 = psycopg2:main
+    #
+    # Would create an entry point called psycopg2 that calls psycopg2.main()
+
+
+  # If this is a new build for the same version, increment the build
+  # number. If you do not include this key, it defaults to 0.
+  # number: 1
+
+requirements:
+  build:
+    - python
+
+  run:
+    - python
+
+test:
+  # Python imports
+  imports:
+    - psycopg2
+    - psycopg2.tests
+
+  # commands:
+    # You can put test commands to be run here.  Use this to test that the
+    # entry points work.
+
+
+  # You can also put a file called run_test.py in the recipe that will be run
+  # at test time.
+
+  # requires:
+    # Put any additional test requirements here.  For example
+    # - nose
+
+about:
+  home: http://initd.org/psycopg/
+  license: GNU Library or Lesser General Public License (LGPL) or Zope Public License
+  summary: 'psycopg2 - Python-PostgreSQL Database Adapter'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml

requirements.txt

@@ -8,6 +8,7 @@ sqlalchemy
 matplotlib
 #pandas
 #geoalchemy2
+
 addons:
   apt:
     packages:
@@ -18,3 +19,4 @@ addons:
       - wx2.8-examples
       - wx2.8-headers
       - wx2.8-i18n
+

requirements_tests.txt

@@ -0,0 +1,6 @@
+-r requirements.txt
+pytest
+pytest-cov
+mock
+
+#mysql-python

tests/test_controller/test_bulkInsert.py

@@ -4,7 +4,7 @@
 
 class TestBulkInsert:
     def setup(self):
-        self.app = wx.App()
+        # self.app = wx.App()
         self.BulkInsert = BulkInsert(None)
         path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
         self.CSVPath = os.path.join(path, 'example_files', 'exampleBulkInsert.csv')