Merge pull request pymssql#393 from pymssql/cleanup-tree

Cleanup tree

Author: ramiro

.travis.yml

@@ -18,7 +18,7 @@ install:
 - if [[ $FREETDS_VERSION == '0.95' ]]; then export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1; fi
 - python setup.py develop
 script:
-- . bin/travis_env.sh
+- . dev/travis_env.sh
 - echo "\$PYMSSQL_TEST_DATABASE = \"$PYMSSQL_TEST_DATABASE\""
 - py.test -v
 - cd docs && test -z "$(make SPHINXOPTS='-q' html 2>&1 | egrep -w 'SEVERE:|ERROR:')"

appveyor.yml

@@ -12,7 +12,7 @@ environment:
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
-    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\dev\\appveyor\\run_with_env.cmd"
     OPENSSL_VER: 1.0.2e
     FREETDS_VER: 0.95.81
 
@@ -139,7 +139,7 @@ environment:
 install:
   # Install Python (from the official .msi of http://python.org) and pip when
   # not already installed.
-  - "powershell appveyor\\install.ps1"
+  - "powershell dev\\appveyor\\install.ps1"
 
   # Prepend current Python and scripts dirs to the PATH of this build (this cannot be
   # done from inside the powershell script as it would require to restart
@@ -154,7 +154,7 @@ install:
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  - "%CMD_IN_ENV% pip install -r dev-requirements.pip"
+  - "%CMD_IN_ENV% pip install -r dev\\dev-requirements.pip"
   - cmd: if %PYTHON_VERSION:~0,1% == 3 ( %CMD_IN_ENV% pip install gevent==1.1.b6 ) else ( %CMD_IN_ENV% pip install gevent )
 
 before_build:
@@ -172,7 +172,7 @@ build_script:
   - "%CMD_IN_ENV% python setup.py install"
 
 before_test:
-  - copy appveyor\tests.cfg tests\
+  - copy dev\appveyor\tests.cfg tests\
   # Add relevant OpenSSL DLLs dir to PATH envvar
   - ps: |
       if ($env:PYTHON_ARCH -eq 32) {
@@ -184,7 +184,7 @@ before_test:
   - set PATH=%CD%\freetds\vs%VS_VER%_%PYTHON_ARCH%\lib;%PATH%
   # Start, reconfigure and restart SQL Server
   - net start MSSQL$%INSTANCENAME%
-  - "powershell appveyor\\sql-server-activate-tcp-fixed-port.ps1"
+  - "powershell dev\\appveyor\\sql-server-activate-tcp-fixed-port.ps1"
 
 test_script:
   - "py.test --junitxml=junit.xml"
@@ -206,6 +206,6 @@ on_success:
     if ($env:APPVEYOR_REPO_TAG -eq "true" -or $env:APPVEYOR_REPO_TAG -eq "True") {
       If ($env:INSTANCENAME -eq "SQL2012SP1") {
         pip install twine --upgrade
-        twine upload -u $env:PYPI_USERNAME -p $env:PYPI_PASSWORD --config-file appveyor\pypirc -r pypi $env:APPVEYOR_BUILD_FOLDER\dist\*.whl
+        twine upload -u $env:PYPI_USERNAME -p $env:PYPI_PASSWORD --config-file dev\appveyor\pypirc -r pypi $env:APPVEYOR_BUILD_FOLDER\dist\*.whl
       }
     }