Skip to content

Commit 0abcd15

Browse files
committed
Version bump v10.2.2-beta.1
+ Match Komodo Editor's major/minor version
1 parent 41b264b commit 0abcd15

290 files changed

Lines changed: 14266 additions & 30956 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.appveyor/windows_sdk.cmd

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
:: To build extensions for 64 bit Python 3.5 or later no special environment needs
2+
:: to be configured.
3+
::
4+
:: To build extensions for 64 bit Python 3.4 or earlier, we need to configure environment
5+
:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
6+
:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
7+
::
8+
:: To build extensions for 64 bit Python 2, we need to configure environment
9+
:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
10+
:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
11+
::
12+
:: 32 bit builds do not require specific environment configurations.
13+
::
14+
:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
15+
:: cmd interpreter, at least for (SDK v7.0)
16+
::
17+
:: More details at:
18+
:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
19+
:: https://stackoverflow.com/a/13751649/163740
20+
::
21+
:: Original Author: Olivier Grisel
22+
:: License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/
23+
:: This version based on updates for python 3.5 by Phil Elson at:
24+
:: https://github.com/pelson/Obvious-CI/tree/master/scripts
25+
26+
@ECHO OFF
27+
28+
SET COMMAND_TO_RUN=%*
29+
SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
30+
31+
SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
32+
SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
33+
IF %MAJOR_PYTHON_VERSION% == "2" (
34+
SET WINDOWS_SDK_VERSION="v7.0"
35+
SET SET_SDK_64=Y
36+
) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
37+
SET WINDOWS_SDK_VERSION="v7.1"
38+
IF %MINOR_PYTHON_VERSION% LEQ 4 (
39+
SET SET_SDK_64=Y
40+
) ELSE (
41+
SET SET_SDK_64=N
42+
)
43+
) ELSE (
44+
ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
45+
EXIT 1
46+
)
47+
48+
IF "%PYTHON_ARCH%"=="64" (
49+
IF %SET_SDK_64% == Y (
50+
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
51+
SET DISTUTILS_USE_SDK=1
52+
SET MSSdk=1
53+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
54+
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
55+
ECHO Executing: %COMMAND_TO_RUN%
56+
call %COMMAND_TO_RUN% || EXIT 1
57+
) ELSE (
58+
ECHO Using default MSVC build environment for 64 bit architecture
59+
ECHO Executing: %COMMAND_TO_RUN%
60+
call %COMMAND_TO_RUN% || EXIT 1
61+
)
62+
) ELSE (
63+
ECHO Using default MSVC build environment for 32 bit architecture
64+
ECHO Executing: %COMMAND_TO_RUN%
65+
call %COMMAND_TO_RUN% || EXIT 1
66+
)

.travis.yml

Lines changed: 179 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,198 @@
1+
branches:
2+
only:
3+
- /^v[0-9]/
4+
15
language: python
26

37
cache:
4-
directories:
5-
- "$HOME/.cache/pip"
6-
- "$HOME/.pyenv"
8+
- pip
9+
- directories:
10+
- $HOME/.cache/pip
11+
- ${PYENV_CACHE_PATH:-$HOME/.pyenv_cache}
12+
13+
env:
14+
global:
15+
# travis encrypt PYPIPASSWORD=secret_password --add env.global
16+
secure: ggV2/f4LBr78bvBS4osuXIK7QvLFnPpZ6U4FDFLU6EbTxseg+mkcLqefeNsU7wzUyAJHIu6G/0ZHu5lGANNEPhL4Nkchb0WXIxCNreBfoHDoF93yLm+WCRrDLj4AlZETaaHnW3515KYoYll7b/U32vhMXN7E1s75+O3j6SEuwTMVW6hVwmqg865pOAcVVV3KCTh7Nm+uy3NzbO5QiTvI8yEgizBm2Q9972jK6fTHmX/UZZ7kuZSIh4Iy9Bm7ONcHwZdaSSDeWQOXU0WD2e6AyjJbqrp9ba7GKhaVET4dPjjRHx/QzIUFXlH2bnSKh2JsqLoca2zMyOmRgXUDAWdbO/qAsZgQwSZCIQgjRTjUEPJEUs7wJlqP+7a4Gk23qSMj+lxuP+shW+/yBoG7jW9Fh/pKGgRLwvVrGtf86aIuAPTqqODqQJ7b2rwfErE7eyutyvmALaOdByxsVe/ijewzva6mbnH0kddCW+jOZanWWsSvt/aXYCaLtvjPOW4cBTJnGN68OBjf+99dJep+oLsbfQNmjE92YqPRjB2FjOA+QJeuCGLi9bFDZJMjrq80+a3wy9zJX6Eyy0fILNSMsInz98T0eu5A5ZZoJTjCV7fB54KOYMeP3fFeRz4ZG1J64frowPHXBLz2R3sFBP49lXiSDvLT91/B+ydLEEs/O5V0F1w=
717

818
matrix:
919
include:
10-
- os: linux
11-
dist: trusty
12-
python: '2.6'
20+
# Sources
1321
- os: linux
1422
dist: trusty
1523
python: '2.7'
16-
# - os: linux
17-
# dist: trusty
18-
# python: '3.3'
19-
# - os: linux
20-
# dist: trusty
21-
# python: '3.4'
22-
# - os: linux
23-
# dist: trusty
24-
# python: '3.5'
25-
# - os: linux
26-
# dist: trusty
27-
# python: '3.6'
28-
- os: linux
29-
dist: trusty
30-
python: pypy
31-
- os: osx
32-
language: objective-c
33-
env: PYENV_VERSION=2.7.12
34-
# - os: osx
35-
# language: objective-c
36-
# env: PYENV_VERSION=3.5.2
24+
env: SETUP_BUILD='sdist'
25+
26+
# Manylinux binaries
27+
- sudo: required
28+
services:
29+
- docker
30+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_i686'
31+
DOCKER_OPTIONS='-e PYTHON_VERSION=27'
32+
DOCKER_PRE_CMD='linux32'
33+
34+
- sudo: required
35+
services:
36+
- docker
37+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_i686'
38+
DOCKER_OPTIONS='-e PYTHON_VERSION=26'
39+
DOCKER_PRE_CMD='linux32'
40+
41+
- sudo: required
42+
services:
43+
- docker
44+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_i686'
45+
DOCKER_OPTIONS='-e PYTHON_VERSION=36'
46+
DOCKER_PRE_CMD='linux32'
47+
48+
- sudo: required
49+
services:
50+
- docker
51+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_i686'
52+
DOCKER_OPTIONS='-e PYTHON_VERSION=35'
53+
DOCKER_PRE_CMD='linux32'
54+
55+
- sudo: required
56+
services:
57+
- docker
58+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_i686'
59+
DOCKER_OPTIONS='-e PYTHON_VERSION=34'
60+
DOCKER_PRE_CMD='linux32'
61+
62+
- sudo: required
63+
services:
64+
- docker
65+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_i686'
66+
DOCKER_OPTIONS='-e PYTHON_VERSION=33'
67+
DOCKER_PRE_CMD='linux32'
68+
69+
- sudo: required
70+
services:
71+
- docker
72+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_x86_64'
73+
DOCKER_OPTIONS='-e PYTHON_VERSION=27'
74+
75+
- sudo: required
76+
services:
77+
- docker
78+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_x86_64'
79+
DOCKER_OPTIONS='-e PYTHON_VERSION=26'
80+
81+
- sudo: required
82+
services:
83+
- docker
84+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_x86_64'
85+
DOCKER_OPTIONS='-e PYTHON_VERSION=36'
86+
3787
- sudo: required
3888
services:
3989
- docker
40-
env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
90+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_x86_64'
91+
DOCKER_OPTIONS='-e PYTHON_VERSION=35'
92+
4193
- sudo: required
4294
services:
4395
- docker
44-
env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
45-
PRE_CMD=linux32
96+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_x86_64'
97+
DOCKER_OPTIONS='-e PYTHON_VERSION=34'
98+
99+
- sudo: required
100+
services:
101+
- docker
102+
env: DOCKER_IMAGE='quay.io/pypa/manylinux1_x86_64'
103+
DOCKER_OPTIONS='-e PYTHON_VERSION=33'
104+
105+
# OS X binaries
106+
- os: osx
107+
osx_image: xcode8.3 # OS X 10.12
108+
language: objective-c
109+
env: PYENV_VERSION='2.7.13' PYENV_VERSION_STRING='Python 2.7.13'
110+
- os: osx
111+
osx_image: xcode7.3 # OS X 10.11
112+
language: objective-c
113+
env: PYENV_VERSION='2.7.13' PYENV_VERSION_STRING='Python 2.7.13'
114+
- os: osx
115+
osx_image: xcode6.4 # OS X 10.10
116+
language: objective-c
117+
env: PYENV_VERSION='2.7.13' PYENV_VERSION_STRING='Python 2.7.13'
118+
119+
- os: osx
120+
osx_image: xcode8.3 # OS X 10.12
121+
language: objective-c
122+
env: PYENV_VERSION='2.6.9' PYENV_VERSION_STRING='Python 2.6.9'
123+
- os: osx
124+
osx_image: xcode7.3 # OS X 10.11
125+
language: objective-c
126+
env: PYENV_VERSION='2.6.9' PYENV_VERSION_STRING='Python 2.6.9'
127+
- os: osx
128+
osx_image: xcode6.4 # OS X 10.10
129+
language: objective-c
130+
env: PYENV_VERSION='2.6.9' PYENV_VERSION_STRING='Python 2.6.9'
131+
132+
- os: osx
133+
osx_image: xcode8.3 # OS X 10.12
134+
language: objective-c
135+
env: PYENV_VERSION='3.6.0' PYENV_VERSION_STRING='Python 3.6.0'
136+
- os: osx
137+
osx_image: xcode7.3 # OS X 10.11
138+
language: objective-c
139+
env: PYENV_VERSION='3.6.0' PYENV_VERSION_STRING='Python 3.6.0'
140+
- os: osx
141+
osx_image: xcode6.4 # OS X 10.10
142+
language: objective-c
143+
env: PYENV_VERSION='3.6.0' PYENV_VERSION_STRING='Python 3.6.0'
144+
145+
- os: osx
146+
osx_image: xcode8.3 # OS X 10.12
147+
language: objective-c
148+
env: PYENV_VERSION='3.5.2' PYENV_VERSION_STRING='Python 3.5.2'
149+
- os: osx
150+
osx_image: xcode7.3 # OS X 10.11
151+
language: objective-c
152+
env: PYENV_VERSION='3.5.2' PYENV_VERSION_STRING='Python 3.5.2'
153+
- os: osx
154+
osx_image: xcode6.4 # OS X 10.10
155+
language: objective-c
156+
env: PYENV_VERSION='3.5.2' PYENV_VERSION_STRING='Python 3.5.2'
157+
158+
- os: osx
159+
osx_image: xcode8.3 # OS X 10.12
160+
language: objective-c
161+
env: PYENV_VERSION='3.4.5' PYENV_VERSION_STRING='Python 3.4.5'
162+
- os: osx
163+
osx_image: xcode7.3 # OS X 10.11
164+
language: objective-c
165+
env: PYENV_VERSION='3.4.5' PYENV_VERSION_STRING='Python 3.4.5'
166+
- os: osx
167+
osx_image: xcode6.4 # OS X 10.10
168+
language: objective-c
169+
env: PYENV_VERSION='3.4.5' PYENV_VERSION_STRING='Python 3.4.5'
170+
171+
- os: osx
172+
osx_image: xcode8.3 # OS X 10.12
173+
language: objective-c
174+
env: PYENV_VERSION='3.3.6' PYENV_VERSION_STRING='Python 3.3.6'
175+
- os: osx
176+
osx_image: xcode7.3 # OS X 10.11
177+
language: objective-c
178+
env: PYENV_VERSION='3.3.6' PYENV_VERSION_STRING='Python 3.3.6'
179+
- os: osx
180+
osx_image: xcode6.4 # OS X 10.10
181+
language: objective-c
182+
env: PYENV_VERSION='3.3.6' PYENV_VERSION_STRING='Python 3.3.6'
183+
184+
185+
before_install:
186+
- if [[ "$DOCKER_IMAGE" == "" ]]; then source "${SETUP_SCRIPT:-.travis/pyenv-setup.sh}"; fi
187+
- python --version
46188

47189
install:
48-
- if [[ "$DOCKER_IMAGE" != "" ]]; then docker pull $DOCKER_IMAGE; fi
190+
- if [[ "$DOCKER_IMAGE" != "" ]]; then docker pull ${DOCKER_IMAGE}; fi
49191

50192
script:
51-
- if [[ "$DOCKER_IMAGE" != "" ]]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/.travis/manylinux-build.sh; else travis_retry python setup.py bdist_wheel; fi
52-
- ls dist/
53-
54-
artifacts:
55-
# bdist_wheel puts your built wheel in the dist directory
56-
- path: dist/*
57-
58-
# deploy:
59-
# provider: releases
60-
# api_key:
61-
# secure: QiadMGAmtPw+Ut7LWqa3U/tImPIgiPH79mM9o8DGBckcacp9HkDYvCGuOjs5hZbCBBuQ6IAkikotS8iCSwHey1GK9jSDbpgKvVGiACdp8HNhitY8V/S3e1UukDlMeu+Q7vCJtynSGX0BJuiOQB8ZQyQ2HEZ7kMQgTLCEO1Uljhc=
62-
# file: dist/*.whl
63-
# file_glob: true
64-
# on:
65-
# repo: Kronuz/CodeIntel
66-
# tags: true
67-
# skip_cleanup: true
193+
- if [[ "$DOCKER_IMAGE" != "" ]]; then docker run --rm -v `pwd`:/io ${DOCKER_OPTIONS} ${DOCKER_IMAGE} ${DOCKER_PRE_CMD} /io/.travis/manylinux-build.sh; fi
194+
- if [[ "$DOCKER_IMAGE" == "" ]]; then pip install wheel && python setup.py ${SETUP_BUILD:-bdist_wheel}; fi
195+
196+
after_success:
197+
- ls -la dist/
198+
- if [[ "$TRAVIS_TAG" != "" ]]; then pip install twine && for file in dist/*; do twine upload -u Kronuz -p ${PYPIPASSWORD} "${file}"; done; fi

.travis/manylinux-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e -x
44
cd /io/
55

66
# Compile wheels
7-
for PYBIN in /opt/python/cp2*/bin; do
7+
for PYBIN in /opt/python/cp${PYTHON_VERSION}*/bin; do
88
"${PYBIN}/python" setup.py bdist_wheel
99
done
1010

0 commit comments

Comments
 (0)