Skip to content

Commit 8604c69

Browse files
author
stephanie
committed
appveyor.yml for mysql and postgres
1 parent 1b81956 commit 8604c69

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

appveyor.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ environment:
88
MINICONDA_VERSION: "latest"
99
# CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
1010
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers/appveyor/windows_sdk.cmd"
11-
CONDA_CHANNELS: "ODM2"
11+
CONDA_CHANNELS: "odm2"
1212
CONDA_DEPENDENCIES: "scipy pandas seaborn sqlalchemy pymysql geoalchemy-odm2 shapely psycopg2"
1313
PIP_DEPENDENCIES: "pyodbc,pytest"
1414
#,-e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
@@ -89,7 +89,7 @@ install:
8989
# the parent CMD process).
9090
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
9191
# add databases
92-
- "SET PATH=%POSTGRES_PATH%\bin;%MYSQL_PATH%\bin;%PATH%"
92+
- "SET PATH=%POSTGRES_PATH%\\bin;%MYSQL_PATH%\\bin;%PATH%"
9393
- "activate test"
9494

9595
# Check that we have the expected version and architecture for Python
@@ -101,17 +101,17 @@ install:
101101
build_script:
102102
##https://github.com/sqlectron/sqlectron-core/blob/master/appveyor.yml
103103

104-
#sqlserver
104+
# sqlserver
105105
- ps: ci-helpers\appveyor\sqlserver.ps1 SQL2008R2SP2
106106
- sqlcmd -S localhost,1433 -U sa -P Password12! -Q "CREATE DATABASE odm2" -d "master"
107107
- sqlcmd -S localhost,1433 -U sa -P Password12! -i tests/usecasesql/littlebearriver/sampledatabases/odm2_ms_sql_server/LBR_ODM2_MSSQLDump.sql -d "odm2"
108108
- sqlcmd -S localhost,1433 -U sa -P Password12! -Q "select table_name from information_schema.tables" -d "odm2"
109-
# # postgres
110-
# - psql createdb odm2
111-
# - psql -d odm2 -a -f tests/usecasesql/marchantariats/marchantariats.sql
109+
# postgres
110+
- psql createdb marchantariats
111+
- psql -d marchantariats -a -f tests/usecasesql/marchantariats/marchantariats.sql
112112
# mysql
113-
# - mysql -e "drop database test; create database odm2;" --user=root
114-
# - mysql odm2 < tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql --user=root
113+
- mysql -e "drop database test; create database odm2;" --user=root
114+
- mysql odm2 < tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql --user=root
115115

116116
test_script:
117117
# Run the project tests

ci-helpers/appveyor/install-miniconda.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ if ($env:ASTROPY_VERSION -match "dev") {
168168
Invoke-Expression "${env:CMD_IN_ENV} pip install git+https://github.com/astropy/astropy.git#egg=astropy --upgrade --no-deps"
169169
}
170170

171-
Invoke-Expression "${env:CMD_IN_ENV} pip install -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
171+
#Invoke-Expression "${env:CMD_IN_ENV} pip install -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
172172

173173

174174

requirements_tests.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pytest-cov
44
mock
55
#db support
66
pymysql
7-
pymssql
7+
#pymssql
88
psycopg2
99
#pysqlite
1010
#sqlite

0 commit comments

Comments
 (0)