From 103ee05f010bcf51df278ffaffbd38be256060de Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@esss.co>
Date: Fri, 12 May 2023 12:24:33 -0300
Subject: [PATCH 1/4] Release 3.3.0

---
 CHANGELOG.rst                 | 9 +++++++++
 changelog/555.improvement.rst | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)
 delete mode 100644 changelog/555.improvement.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4a10511..6501b12 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+pytest-xdist 3.3.0 (2023-05-12)
+===============================
+
+Features
+--------
+
+- `#555 <https://github.com/pytest-dev/pytest-xdist/issues/555>`_: Improved progress output when collecting nodes to be less verbose.
+
+
 pytest-xdist 3.2.1 (2023-03-12)
 ===============================
 
diff --git a/changelog/555.improvement.rst b/changelog/555.improvement.rst
deleted file mode 100644
index f70ff53..0000000
--- a/changelog/555.improvement.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improved progress output when collecting nodes to be less verbose.

From fa08e0987bea6a094deb48fda6b61d37373b4520 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 12 May 2023 17:28:15 -0300
Subject: [PATCH 2/4] Add check-package step also to 'test' workflow

This ensures we do not have any surprises when we try to deploy,
which uses the same step to generate the package.
---
 .github/workflows/test.yml | 8 ++++++++
 setup.cfg                  | 1 +
 2 files changed, 9 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f6effe..a350ca6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,14 @@ on:
       - "*"
 
 jobs:
+
+  check-package:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build and Check Package
+      uses: hynek/build-and-inspect-python-package@v1.5
+
   test:
 
     runs-on: ${{ matrix.os }}
diff --git a/setup.cfg b/setup.cfg
index 3162a90..77346ad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,6 +2,7 @@
 name = pytest-xdist
 description = pytest xdist plugin for distributed testing, most importantly across multiple CPUs
 long_description = file: README.rst
+long_description_content_type = text/x-rst
 license = MIT
 author = holger krekel and contributors
 author_email = pytest-dev@python.org,holger@merlinux.eu

From 657ba9ac7fe5f58930f7ed39c359893469c65936 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 12 May 2023 17:30:53 -0300
Subject: [PATCH 3/4] Only test on-push for master and a specific branch name

This avoids testing twice when pushing to the main repository, once for the push, and another for a PR.
---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a350ca6..05de2b2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,8 @@ name: test
 on:
   push:
     branches:
-      - "*"
+      - master
+      - "test-me-*"
 
   pull_request:
     branches:

From f5b4a5d6edea6a9eb016730f5de0aae8cbc9930e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 12 May 2023 17:31:35 -0300
Subject: [PATCH 4/4] Configure 'test' workflow to cancel running jobs for the
 branch

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05de2b2..f404401 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,11 @@ on:
     branches:
       - "*"
 
+# Cancel running jobs for the same workflow and branch.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
 
   check-package: