Merge branch 'master' into master

.github/workflows/tests.yml

@@ -1,37 +1,67 @@
-name: Nose tests
+name: pika
 
 on:
   push:
     branches:
       - "*"
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
-  tests:
-    name: tests
+  build-win32:
+    name: build/test on windows-latest
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        test-tls: [true, false]
+    env:
+      PIKA_TEST_TLS: ${{ matrix.test-tls }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Cache installers
+        uses: actions/cache@v3
+        with:
+          # Note: the cache path is relative to the workspace directory
+          # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#using-the-cache-action
+          path: ~/installers
+          key: ${{ runner.os }}-v0-${{ hashFiles('testdata/versions.json') }}
+      - name: Install and start RabbitMQ
+        run: ./testdata/install.ps1
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip wheel
+          pip install -r test-requirements.txt
+      - name: Test with nose2
+        run: |
+          nose2 -v
+  build:
+    name: build/test on ubuntu-latest
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     services:
       rabbitmq:
         image: rabbitmq
         ports:
           - 5672:5672
           - 5671:5671
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi
-      - name: Test with nosetests
+          python -m pip install --upgrade pip wheel
+          pip install -r test-requirements.txt
+      - name: Test with nose2
         run: |
-          nosetests
+          nose2 -v

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Version History
 ===============
 
+1.2.1 2022-04-27
+----------------
+
+`GitHub milestone <https://github.com/pika/pika/milestone/18?closed=1>`_
+
 1.2.0 2021-02-04
 ----------------
 

CONTRIBUTING.md

@@ -32,7 +32,7 @@ which on Python 3 might look like this
 
 To run all test suites, use
 
-    nosetests
+    nose2
 
 Note that some tests are OS-specific (e.g. epoll on Linux
 or kqueue on MacOS and BSD). Those will be skipped
@@ -56,7 +56,7 @@ If you would like to run TLS/SSL tests, use the following procedure:
 * Run the tests indicating that TLS/SSL connections should be used:
 
     ```
-    PIKA_TEST_TLS=true nosetests
+    PIKA_TEST_TLS=true nose2
     ```
 
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2019, Tony Garnock-Jones, Gavin M. Roy, Pivotal Software, Inc and others.
+Copyright (c) 2009-2021, Tony Garnock-Jones, Gavin M. Roy, Pivotal Software, Inc and others.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.rst

@@ -2,7 +2,7 @@ Pika
 ====
 Pika is a RabbitMQ (AMQP 0-9-1) client library for Python.
 
-|Version| |Python versions| |Actions Status| |AppVeyor Status| |Coverage| |License| |Docs|
+|Version| |Python versions| |Actions Status| |Coverage| |License| |Docs|
 
 Introduction
 ------------
@@ -272,9 +272,6 @@ New non-blocking adapters may be implemented in either of the following ways:
 .. |Actions Status| image:: https://github.com/pika/pika/actions/workflows/tests.yml/badge.svg
    :target: https://github.com/pika/pika/actions/workflows/tests.yml
 
-.. |AppVeyor Status| image:: https://ci.appveyor.com/api/projects/status/ql8u3dlls7hxvbqo?svg=true
-   :target: https://ci.appveyor.com/project/gmr/pika
-
 .. |Coverage| image:: https://img.shields.io/codecov/c/github/pika/pika.svg?
    :target: https://codecov.io/github/pika/pika?branch=master