updated based on the comments in pull request #46.

Cleaned up travis, and setup.py uses requirements.txt (pip.parserequirements)

Author: valentinedwv

.travis.yml

@@ -21,61 +21,21 @@ services:
 #addons:
 #  mariadb: '10.1'
 before_install:
-#  - strace mysql 2>&1 | grep cnf
-#stat("/etc/my.cnf", 0x7ffef7c8dca0)     = -1 ENOENT (No such file or directory)
-#stat("/etc/mysql/my.cnf", {st_mode=S_IFREG|0644, st_size=5232, ...}) = 0
-#open("/etc/mysql/my.cnf", O_RDONLY|O_CLOEXEC) = 3
-#stat("/etc/mysql/conf.d/mariadb.cnf", {st_mode=S_IFREG|0644, st_size=435, ...}) = 0
-#open("/etc/mysql/conf.d/mariadb.cnf", O_RDONLY|O_CLOEXEC) = 4
-#stat("/etc/mysql/conf.d/mysqld_safe_syslog.cnf", {st_mode=S_IFREG|0644, st_size=36, ...}) = 0
-#open("/etc/mysql/conf.d/mysqld_safe_syslog.cnf", O_RDONLY|O_CLOEXEC) = 4
-#stat("/etc/mysql/conf.d/tokudb.cnf", {st_mode=S_IFREG|0644, st_size=285, ...}) = 0
-#open("/etc/mysql/conf.d/tokudb.cnf", O_RDONLY|O_CLOEXEC) = 4
-#stat("/home/travis/.my.cnf", 0x7ffef7c8dca0) = -1 ENOENT (No such file or directory)
-#  - ls -l /etc/mariadb
-  - mysqld --help --verbose
-  - mysql -uroot -e 'SHOW VARIABLES WHERE Variable_Name LIKE "%dir"'
-  # Default options are read from the following files in the given order:
- # /etc/my.cnf /etc/mysql/my.cnf ~/.my.cnf
-#  - ls -al .my.cnf
-#  - ls -al /etc/my.cnf
-  - ls -al /etc/mysql/conf.d/
-  - ls -al /etc/mysql/
-#  - ls -al /var/lib/mysql
-#  - ls -al /usr/local/etc/my.cnf.d/
-#  - cat /etc/mysql/conf.d/mariadb.cnf
-#  - cat /etc/mysql/conf.d/tokudb.cnf
-#  - cat /etc/mysql/conf.d/mysqld_safe_syslog.cnf
-  - cat /etc/mysql/debian-start
-  - cat /usr/share/mysql/debian-start.inc.sh
-  - cat /etc/init.d/mysql
-  - sudo cat /etc/mysql/debian.cnf
-  #  - cat /etc/apparmor.d/usr.sbin.mysqld
-  - ls -al /etc/mysql
+ - ls -al /etc/mysql
   - sudo service mysql stop
-#  -    echo "[mysqld]" > /etc/my.cnf
-#  -    echo "lower_case_table_names = 1" >> /etc/my.cnf
-#  -  sudo  echo "[mariadb-10.0]" >> /etc/my.cnf
-#  -  sudo  echo "lower_case_table_names = 1" >> /etc/my.cnf
+# lower-case-table-names = 1 leaving lower_case_table_names=1 since that is what the docs say
   -  echo "[mysqld]" > $HOME/.my.cnf
   -  echo "lower-case-table-names = 1" >> $HOME/.my.cnf
 #  -  echo "lower_case_table_names=1" >> $HOME/.my.cnf
-  - cat $HOME/.my.cnf
-#  -  echo "[mariadb-10.0]" >> .my.cnf
-#  -  echo "lower_case_table_names = 1" >> .my.cnf
-#  - sudo echo "[mysqld]" >> /etc/mysql/debian.cnf
-#  - sudo echo "lower_case_table_names = 2" >> /etc/mysql/debian.cnf
+  - cat $HOME/.my.cnf # be sure it registered
   - service --status-all
-#  - sudo cat /etc/mysql/debian.cnf
-#  - sudo echo "[mysqld]" >> /etc/mysql/debian.cnf
-#  - sudo echo "lower_case_table_names=1" >> /etc/mysql/debian.cnf
-  - sudo cat /etc/mysql/debian.cnf
-  - sudo sed -i '/\[mysqld\]/a lower_case_table_names = 1 ' /etc/mysql/my.cnf
-  - cat /etc/mysql/my.cnf
-  - sudo service mysql start
-#  - sudo service mysql restart
+#  this should have worked.
+#  - sudo sed -i '/\[mysqld\]/a lower_case_table_names = 1 ' /etc/mysql/my.cnf
+#  - cat /etc/mysql/my.cnf
+  - sudo service mysql start  restart
   - mysql --verbose -e  "show variables like 'lower%';" --user=root
-#  - strace mysql 2>&1 | grep cnf
+
+#  - strace mysql 2>&1 | grep cnf # will tell you what files are being used
   - mysql --verbose -e "CREATE USER 'ODM'@'localhost' IDENTIFIED BY 'odm';GRANT ALL PRIVILEGES ON *.* TO 'ODM'@'localhost';" --user=root
   - mysql --verbose -e "CREATE USER 'ODM'@'127.0.0.1' IDENTIFIED BY 'odm';GRANT ALL PRIVILEGES ON *.* TO 'ODM'@'127.0.0.1';" --user=root
   - mysql --verbose -e "CREATE USER 'ODM'@'%' IDENTIFIED BY 'odm';GRANT ALL PRIVILEGES ON *.* TO 'ODM'@'%';" --user=root
@@ -154,25 +114,20 @@ install: # now just our code
   - ls -al  ./tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql ./tests/usecasesql/marchantariats/marchantariats.sql
   - mysql --user=ODM --password=odm  odm2 < ./tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql
   - mysql --user=root  -e  "show databases;"
-  - mysql --user=root  -e "select table_schema,table_name,table_rows from information_schema.tables;"
   - mysql --user=root -e   "GRANT ALL PRIVILEGES ON odm2.* TO 'ODM'@'localhost';FLUSH PRIVILEGES;"
+# these should all work, if they don't the lower_case_table_names failed
   - mysql --user=ODM --password=odm odm2 -e "use odm2; Select * from Variables;"
-  - mysql --user=ODM --password=odm odm2 -e "use odm2; Select * from variables;"
-#  - mysql --user=ODM --password=odm odm2 -e "Select * from odm2.Variables;"
+  - mysql --user=ODM --password=odm odm2 -e "Select * from odm2.Variables;"
   - mysql --user=ODM --password=odm  -e "Select * from odm2.Variables;"
-  - mysql --user=ODM --password=odm  -e "Select * from odm2.variables;"
 # add -a to psql to see full log, -q is quiet
   - psql -U postgres -q  -f ./tests/usecasesql/marchantariats/marchantariats.sql
-#  - netstat output | grep mysql
-  - mysql --user root -e   "SELECT User, Host FROM mysql.user;"
+
 
 # don't forget to open up the azure mssql server to these addreses
 # https://docs.travis-ci.com/user/ip-addresses/
 
 # command to run tests
 script:
-# just the connection part
-  - py.test tests/test_SessionFactory.py
-  - py.test tests/test_connection.py
+
   - py.test
 

appveyor.yml

@@ -33,13 +33,16 @@ environment:
     # a later point release.
     # See: http://www.appveyor.com/docs/installed-software#python
 
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
-      PYTHON_ARCH: "32"
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
-      PYTHON_ARCH: "64"
+    matrix:
+      - PYTHON: "C:\\Python27-conda32"
+        PYTHON_VERSION: "2.7"
+        PYTHON_ARCH: "32"
+
+      - PYTHON: "C:\\Python34-conda64"
+        PYTHON_VERSION: "3.4"
+        PYTHON_ARCH: "64"
+
 services:
   - mssql2008r2sp2
   - mysql

requirements.txt

@@ -1,11 +1,7 @@
 pyodbc
-#pymysql
 six
 sqlalchemy
 -e git+https://github.com/ODM2/geoalchemy.git@odm2#egg=geoalchemy-0.7.3
-#https://github.com/ODM2/geoalchemy/archive/v0.7.3.tar.gz
 shapely
 pandas
 #psycopg2  # Commented out because I could not pip install it.
-#matplotlib
-#sqlalchemy-migrate

setup.py

@@ -19,9 +19,15 @@
 here = path.abspath(path.dirname(__file__))
 # with open('requirements.txt') as f:
 #     require = f.readlines()
-# install_requires = [r.strip() for r in require if
+# install_reqs = [r.strip() for r in require if
 #                     not r.startswith('http') and not r.startswith('#')]
 
+from pip.req import parse_requirements
+
+install_reqs = parse_requirements('requirements.txt', session=False)
+
+reqs = [str(ir.req) for ir in install_reqs]
+
 # Get the long description from the relevant file
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
      long_description = f.read()
@@ -50,7 +56,7 @@
     maintainer_email='david.valentine@gmail.com',
 
     # Choose your license
-    license='BSD',
+    license='BSD-3-Clause',
 
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
@@ -87,15 +93,15 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
 
-    #install_requires=install_requires,
-    install_requires=[
-        'pyodbc',
-        'six',
-        'sqlalchemy',
-        'geoalchemy>=0.7.3',
-        'shapely',
-        'pandas',
-    ],
+    install_requires=install_reqs,
+    # install_requires=[
+    #     'pyodbc',
+    #     'six',
+    #     'sqlalchemy',
+    #     'geoalchemy>=0.7.3',
+    #     'shapely',
+    #     'pandas',
+    # ],
     # dependency_links- geoalchemy from the ODM repository
     dependency_links=[
         "git+https://github.com/ODM2/geoalchemy.git@v0.7.3#egg=geoalchemy-0.7.3"