From 648e80e56dd740f09c8c14413f959a1aaa9e4fcb Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Fri, 30 Oct 2020 07:53:09 -0400 Subject: [PATCH 1/2] Set version to 6.1 final --- docs/releases/v6.1.0.rst | 4 ++-- tornado/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/releases/v6.1.0.rst b/docs/releases/v6.1.0.rst index 49426eab..7de6350a 100644 --- a/docs/releases/v6.1.0.rst +++ b/docs/releases/v6.1.0.rst @@ -1,8 +1,8 @@ What's new in Tornado 6.1.0 =========================== -Oct X, 2020 ------------ +Oct 30, 2020 +------------ Deprecation notice ~~~~~~~~~~~~~~~~~~ diff --git a/tornado/__init__.py b/tornado/__init__.py index a458bbdd..a5f45e52 100644 --- a/tornado/__init__.py +++ b/tornado/__init__.py @@ -22,5 +22,5 @@ # is zero for an official release, positive for a development branch, # or negative for a release candidate or beta (after the base version # number has been incremented) -version = "6.1b2" -version_info = (6, 1, 0, -98) +version = "6.1" +version_info = (6, 1, 0, 0) From 0c9e04e43855a10de1df639d8728e099608b0028 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Fri, 30 Oct 2020 09:05:06 -0400 Subject: [PATCH 2/2] ci: Work around outdated windows root certificates --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index fa25e675..83943b29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,11 @@ jobs: language: shell before_install: - choco install python --version 3.8.0 + # Windows build images have outdated root certificates; until that's + # fixed use certifi instead. + # https://github.com/joerick/cibuildwheel/issues/452 + - python -m pip install certifi + - export SSL_CERT_FILE=`python -c "import certifi; print(certifi.where())"` - os: osx env: BUILD_WHEEL=1 language: shell