From 3ef57a97343823396040677e788b540fe304f002 Mon Sep 17 00:00:00 2001
From: Daniel Bast <2790401+dbast@users.noreply.github.com>
Date: Tue, 18 Jan 2022 18:35:48 +0100
Subject: [PATCH] Add Python 3.10 to supported/tested versions in setup.py + CI
 (#202)

---
 .github/workflows/main.yml | 4 ++--
 setup.py                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a7d56c52..2e81905d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,7 +91,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest,ubuntu-latest,windows-latest]
-        pyver: [3.6,3.7,3.8,3.9]
+        pyver: ["3.6","3.7","3.8","3.9","3.10"]
         include:
           # include the appropriate dependencies for testing SquashFS on each OS
           - os: macos-latest
@@ -127,7 +127,7 @@ jobs:
         source $CONDA_ROOT/etc/profile.d/conda.sh
         conda info -a
         mv conda-bld $CONDA_ROOT/conda-bld
-        conda create -n cptest local::conda-pack pytest python=${{ matrix.pyver }} ${{ matrix.squashfs_deps }}
+        conda create -n cptest local::conda-pack conda-forge::pytest python=${{ matrix.pyver }} ${{ matrix.squashfs_deps }}
         conda activate cptest
         pytest -v -ss conda_pack/tests
   upload:
diff --git a/setup.py b/setup.py
index 0622ef7f..87d54264 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@
                    "Programming Language :: Python :: 3.7",
                    "Programming Language :: Python :: 3.8",
                    "Programming Language :: Python :: 3.9",
+                   "Programming Language :: Python :: 3.10",
                    "Topic :: System :: Archiving :: Packaging",
                    "Topic :: System :: Software Distribution",
                    "Topic :: Software Development :: Build Tools"],