From fda738c90d19b77134f6b11d493a0bb841f7924f Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Mon, 15 Apr 2019 02:37:39 +0100 Subject: [PATCH] All together now, let's make this real --- .appveyor.yml | 27 --------------------------- scripts/appveyor.py | 6 ------ 2 files changed, 33 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 809775cb..0a8bcde6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,33 +54,6 @@ init: - curl -fsSL -o "C:\\appveyor.py" https://raw.githubusercontent.com/psycopg/psycopg2/%APPVEYOR_REPO_COMMIT%/scripts/appveyor.py - "%PYEXE% C:\\appveyor.py init" - # TODO: exporting variables below to be dropped once all the steps are - # moved to the appveyor.py script. - - # Set env variable according to the build environment - - SET PYTHON=C:\Python%PYVER% - - IF "%PYTHON_ARCH%"=="64" SET PYTHON=%PYTHON%-x64 - - # Py 2.7 = VS Ver. 9.0 (VS 2008) - # Py 3.4 = VS Ver. 10.0 (VS 2010) - # Py 3.5, 3.6, 3.7 = VS Ver. 14.0 (VS 2015) - - IF "%PYVER%"=="27" SET VS_VER=9.0 - - IF "%PYVER%"=="34" SET VS_VER=10.0 - - IF "%PYVER%"=="35" SET VS_VER=14.0 - - IF "%PYVER%"=="36" SET VS_VER=14.0 - - IF "%PYVER%"=="37" SET VS_VER=14.0 - - - IF "%VS_VER%"=="10.0" IF "%PYTHON_ARCH%"=="64" SET DISTUTILS_USE_SDK=1 - - # Set Python to the path - - SET PATH=%PYTHON%;%PYTHON%\Scripts;C:\Program Files\Git\mingw64\bin;%PATH% - - # Setup the compiler based upon version and architecture - - ECHO Configuring Compiler - - IF "%PYTHON_ARCH%"=="32" (CALL "C:\\Program Files (x86)\\Microsoft Visual Studio %VS_VER%\\VC\\vcvarsall.bat" x86) - - IF "%PYTHON_ARCH%"=="64" (CALL "C:\\Program Files (x86)\\Microsoft Visual Studio %VS_VER%\\VC\\vcvarsall.bat" amd64) - - # Repository gets cloned, Cache is restored install: diff --git a/scripts/appveyor.py b/scripts/appveyor.py index f10775b3..dda6c583 100755 --- a/scripts/appveyor.py +++ b/scripts/appveyor.py @@ -123,15 +123,11 @@ def step_init(): def step_install(): - # TODO: enable again - return build_openssl() build_libpq() def step_build_script(): - # TODO: enable again - return build_psycopg() @@ -325,8 +321,6 @@ def step_before_test(): def step_after_build(): # Print psycopg and libpq versions - # TODO: enable - return for expr in ( 'psycopg2.__version__',