Commit b34cf0d3 authored by Thomas Vincent's avatar Thomas Vincent
Browse files

Merge branch 'tvincent-master-patch-67652' into 'master'

Add python3.9 build, bump version number

See merge request !131
parents e81b7a1e 122262be
Pipeline #37122 passed with stages
in 12 minutes and 23 seconds
......@@ -10,7 +10,7 @@ stages:
variables:
PROJECT: xsocs
EXTRA_SETUP_PY_CMD_OPTIONS: "build --no-openmp"
MANYLINUX_PYTHON_VER: cp27-cp27m cp27-cp27mu cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38
MANYLINUX_PYTHON_VER: cp27-cp27m cp27-cp27mu cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39
# Build
......@@ -24,16 +24,22 @@ manylinux1_wheels:
windows_wheel_python36:
extends: .windows_wheel_python36
only:
- master
windows_wheel_python37:
extends: .windows_wheel_python37
only:
- master
windows_wheel_python38:
extends: .windows_wheel_python38
only:
- master
windows_wheel_python39:
extends: .windows_wheel_python39
doc:
......@@ -95,8 +101,6 @@ manylinux1_test_py27:
manylinux1_test_cp35:
extends: .manylinux1_test
image: python:3.5
only:
- master
manylinux1_test_cp36:
extends: .manylinux1_test
......@@ -107,28 +111,46 @@ manylinux1_test_cp36:
manylinux1_test_cp37:
extends: .manylinux1_test
image: python:3.7
only:
- master
manylinux1_test_cp38:
extends: .manylinux1_test
image: python:3.8
only:
- master
manylinux1_test_cp39:
extends: .manylinux1_test
image: python:3.9
windows_test_python36:
<<: *test_template_defintion
extends: .windows_base_python36
dependencies:
- windows_wheel_python36
only:
- master
windows_test_python37:
<<: *test_template_defintion
extends: .windows_base_python37
dependencies:
- windows_wheel_python37
only:
- master
windows_test_python38:
<<: *test_template_defintion
extends: .windows_base_python38
dependencies:
- windows_wheel_python38
only:
- master
windows_test_python39:
<<: *test_template_defintion
extends: .windows_base_python39
dependencies:
- windows_wheel_python39
# Deploy
......
Change Log
==========
Untagged
---------
v2020.11.0: 2020/11/13
----------------------
* Compatibility:
- Fixed `h5py` v3 compatibilty (MR: !130) and deprecation warnings (MR: !123, !128)
- Fixed `h5py` v3 compatibility (MR: !130) and deprecation warnings (MR: !123, !128)
- Fixed `silx` v0.14 issue (MR: !130) and v0.13 deprecation warnings (MR: !126, !129)
* Miscellaneous:
- Update test environment (MR !124)
- Build wheels for Python3.8 (MR !125)
- Build wheels for Python3.8 and 3.9 (MR !125, !131)
- Update setup.py and test scripts (MR !127)
......
......@@ -71,9 +71,9 @@ PRERELEASE_NORMALIZED_NAME = {"dev": "a",
"candidate": "rc"}
MAJOR = 2020
MINOR = 1
MICRO = 1
RELEV = "dev" # <16
MINOR = 11
MICRO = 0
RELEV = "final" # <16
SERIAL = 0 # <16
date = __date__
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment