.github/CODEOWNERS

@@ -4,5 +4,5 @@
 .github/CODEOWNERS          @sethmlarson @shazow
 src/urllib3/_version.py     @sethmlarson @shazow
 setup.py                    @sethmlarson @shazow
-_travis/                    @sethmlarson @shazow
+ci/                         @sethmlarson @shazow
 .travis.yml                 @sethmlarson @shazow

.github/workflows/ci.yml

@@ -2,38 +2,66 @@ name: CI
 
 on: [push, pull_request]
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
-  macOS:
-    runs-on: macos-latest
-
+  package:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Check packages
+        run: |
+          python3.7 -m pip install wheel twine rstcheck;
+          python3.7 setup.py sdist bdist_wheel;
+          rstcheck README.rst CHANGES.rst
+          python3.7 -m twine check dist/*
+  test:
     strategy:
       fail-fast: false
       matrix:
         python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        os: [macos-latest, windows-latest]
+        experimental: [false]
+        include:
+          - python-version: 3.9-dev
+            os: macos-latest
+            experimental: true
 
+    runs-on: ${{ matrix.os }}
+    name: ${{ fromJson('{"macos-latest":"macOS","windows-latest":"Windows"}')[matrix.os] }} (${{ matrix.python-version }})
+    continue-on-error: ${{ matrix.experimental }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v1
-      - name: Set Up Python 3.7 to run nox
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.7
+        uses: actions/checkout@v2
+
       - name: Set Up Python - ${{ matrix.python-version }}
-        if: matrix.python_version != '3.7'
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+
+      - name: Set Up Python 3.7 to run nox
+        if: matrix.python-version != '3.7'
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
       - name: Install Dependencies
-        run: |
-          python3.7 -m pip install --upgrade nox
+        run: python -m pip install --upgrade nox
+
       - name: Run Tests
-        run: |
-          nox -s test-${{ matrix.python-version }}
+        run: ./ci/run_tests.sh
+        env:
+          PYTHON_VERSION: ${{ matrix.python-version }}
+
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1
-        with:
-          file: ./coverage.xml
-          flags: unittests
-          name: codecov-umbrella
-          yml: ./codecov.yml
-          fail_ci_if_error: true
+        run: ./ci/upload_coverage.sh
+        env:
+          JOB_NAME: "${{ runner.os }} (${{ matrix.python-version }})"

.travis.yml

@@ -8,11 +8,11 @@ before_install:
   - python -c "import ssl; print(ssl.OPENSSL_VERSION)"
 
 install:
-  - ./_travis/install.sh
+  - ./ci/install.sh
 
 script:
-  - ./_travis/run.sh
-  - ./_travis/upload_coverage.sh
+  - ./ci/run.sh
+  - ./ci/upload_coverage.sh
 
 cache:
   directories:
@@ -82,7 +82,7 @@ jobs:
     - python: 3.7
       stage: deploy
       script:
-        - ./_travis/deploy.sh
+        - ./ci/deploy.sh
 
 stages:
   - name: test

CHANGES.rst

@@ -1,6 +1,19 @@
 Changes
 =======
 
+1.25.11 (2020-10-19)
+--------------------
+
+* Fix retry backoff time parsed from ``Retry-After`` header when given
+  in the HTTP date format. The HTTP date was parsed as the local timezone
+  rather than accounting for the timezone in the HTTP date (typically
+  UTC) (Pull #1932, Pull #1935, Pull #1938, Pull #1949)
+
+* Fix issue where an error would be raised when the ``SSLKEYLOGFILE``
+  environment variable was set to the empty string. Now ``SSLContext.keylog_file``
+  is not set in this situation (Pull #2016)
+
+
 1.25.10 (2020-07-22)
 --------------------
 

README.rst

@@ -7,11 +7,11 @@
    </p>
    <p align="center">
       <a href="https://travis-ci.org/urllib3/urllib3"><img alt="Build status on Travis" src="https://travis-ci.org/urllib3/urllib3.svg?branch=master" /></a>
-      <a href="https://ci.appveyor.com/project/urllib3/urllib3"><img alt="Build status on AppVeyor" src="https://img.shields.io/appveyor/ci/urllib3/urllib3/master.svg" /></a>
+      <a href="https://github.com/urllib3/urllib3/actions?query=workflow%3ACI"><img alt="Build status on GitHub" src="https://github.com/urllib3/urllib3/workflows/CI/badge.svg" /></a>
       <a href="https://urllib3.readthedocs.io/en/latest/"><img alt="Documentation Status" src="https://readthedocs.org/projects/urllib3/badge/?version=latest" /></a>
       <a href="https://codecov.io/gh/urllib3/urllib3"><img alt="Coverage Status" src="https://img.shields.io/codecov/c/github/urllib3/urllib3.svg" /></a>
       <a href="https://pypi.org/project/urllib3/"><img alt="PyPI Version" src="https://img.shields.io/pypi/v/urllib3.svg?maxAge=86400" /></a>
-  </p>
+   </p>
 
 urllib3 is a powerful, *sanity-friendly* HTTP client for Python. Much of the
 Python ecosystem already uses urllib3 and you should too.
@@ -75,13 +75,13 @@ Tidelift will coordinate the fix and disclosure with maintainers.
 Maintainers
 -----------
 
-- `@sethmlarson <https://github.com/sethmlarson>`_ (Seth M. Larson)
-- `@pquentin <https://github.com/pquentin>`_ (Quentin Pradet)
-- `@theacodes <https://github.com/theacodes>`_ (Thea Flowers)
-- `@haikuginger <https://github.com/haikuginger>`_ (Jess Shapiro)
-- `@lukasa <https://github.com/lukasa>`_ (Cory Benfield)
-- `@sigmavirus24 <https://github.com/sigmavirus24>`_ (Ian Stapleton Cordasco)
-- `@shazow <https://github.com/shazow>`_ (Andrey Petrov)
+- `@sethmlarson <https://github.com/sethmlarson>`__ (Seth M. Larson)
+- `@pquentin <https://github.com/pquentin>`__ (Quentin Pradet)
+- `@theacodes <https://github.com/theacodes>`__ (Thea Flowers)
+- `@haikuginger <https://github.com/haikuginger>`__ (Jess Shapiro)
+- `@lukasa <https://github.com/lukasa>`__ (Cory Benfield)
+- `@sigmavirus24 <https://github.com/sigmavirus24>`__ (Ian Stapleton Cordasco)
+- `@shazow <https://github.com/shazow>`__ (Andrey Petrov)
 
 👋