Skip to content

Commit

Permalink
Try to fix 64 build on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov committed Jan 8, 2016
1 parent 9680447 commit bf1a542
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 124 deletions.
2 changes: 1 addition & 1 deletion aiohttp/__init__.py
@@ -1,6 +1,6 @@
# This relies on each of the submodules having an __all__ variable.

__version__ = '0.21.0a0'
__version__ = '0.21.0a1'


from . import hdrs # noqa
Expand Down
34 changes: 14 additions & 20 deletions appveyor.yml
Expand Up @@ -4,43 +4,37 @@ environment:
PYPI_PASSWD:
secure: u+K6dKi7+CXXVFEUG4V7zUyV3w7Ntg0Ork/RGVV0eSQ=
matrix:
- PYTHON: "C:\\Python27"
- PYTHON: "C:\\Python33"
- PYTHON: "C:\\Python34"
PYTHON_VERSION: "3.4.3"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python34"
PYTHON_VERSION: "3.4.3"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.0"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.0"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python27-x64"
- PYTHON: "C:\\Python33-x64"
DISTUTILS_USE_SDK: "1"
- PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1"
- PYTHON: "C:\\Python35-x64"

install:
- "powershell ./install_python_and_pip.ps1"
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- "python --version"
- "pip install -r requirements-dev.txt"
- "pip install wheel"
- "pip install twine"
- "python setup.py develop"
- "build.cmd %PYTHON%\\python.exe -m pip install wheel"
- "build.cmd %PYTHON%\\python.exe -m pip install twine"
- "build.cmd %PYTHON%\\python.exe -m pip install -r requirements-dev.txt"

build: false

test_script:
- "python setup.py test"
- "build.cmd %PYTHON%\\python.exe setup.py test"

after_test:
- "python setup.py bdist_wheel"
- "build.cmd %PYTHON%\\python.exe setup.py bdist_wheel"

artifacts:
- path: dist\*

deploy_script:
- ps: >-
if($env:appveyor_repo_tag -eq 'True') {
Invoke-Expression "$env:PYTHON/Scripts/twine upload dist/* --username andrew.svetlov --password $env:PYPI_PASSWD"
Invoke-Expression "$env:PYTHON\\python.exe -m twine upload dist/* --username andrew.svetlov --password $env:PYPI_PASSWD"
}
#notifications:
Expand Down
21 changes: 21 additions & 0 deletions build.cmd
@@ -0,0 +1,21 @@
@echo off
:: To build extensions for 64 bit Python 3, we need to configure environment
:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
:: MS Windows SDK for Windows 7 and .NET Framework 4
::
:: More details at:
:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows

IF "%DISTUTILS_USE_SDK%"=="1" (
ECHO Configuring environment to build with MSVC on a 64bit architecture
ECHO Using Windows SDK 7.1
"C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1
CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
SET MSSdk=1
REM Need the following to allow tox to see the SDK compiler
SET TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB
) ELSE (
ECHO Using default MSVC build environment
)

CALL %*
103 changes: 0 additions & 103 deletions install_python_and_pip.ps1

This file was deleted.

0 comments on commit bf1a542

Please sign in to comment.