Drop Python 3.6 and add Python 3.10 support

.github/workflows/testing.yml

@@ -16,13 +16,13 @@ jobs:
       max-parallel: 12 # All in parallel.
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         exclude:
           # To cut down on runtime since Mac seems to take the longest.
           - os: macos-latest
-            python-version: 3.7
+            python-version: "3.8"
           - os: macos-latest
-            python-version: 3.8
+            python-version: "3.9"
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -39,22 +39,14 @@ jobs:
         run: >
           pytest tests/archives tests/emitters tests/optimizers
           tests/factory_test.py
-      # Extras are not tested on 3.6 because matplotlib 3.4.0, which was used to
-      # generate the reference images in the repo, is not available for 3.6.
-      - name: Install extras deps
-        run: pip install .[all]
-        if: ${{ matrix.python-version != '3.6' }}
-      - name: Test extras
-        run: pytest tests/visualize_test.py
-        if: ${{ matrix.python-version != '3.6' }}
   pin:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
       - name: Install core deps
@@ -74,7 +66,7 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
       - name: Install deps
@@ -90,7 +82,7 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
       - name: Install deps
@@ -104,7 +96,7 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
       - name: Install deps
@@ -118,7 +110,7 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
       - name: Install deps
@@ -134,7 +126,7 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: "3.7"
       - name: Upgrade pip
         run: python -m pip install --upgrade pip
       - name: Install dependencies

CONTRIBUTING.md

@@ -46,7 +46,7 @@ Ready to contribute? Here's how to set up pyribs for local development.
 
    ```bash
    cd pyribs
-   conda create --prefix ./env python=3.6 # 3.6 is the minimum version pyribs supports.
+   conda create --prefix ./env python=3.7 # 3.7 is the minimum version pyribs supports.
    conda activate ./env
    pip install -e .[all]
    pip install -e .[dev]
@@ -115,7 +115,7 @@ Before submitting a pull request, check that it meets these guidelines:
 1. The pull request should include tests.
 1. If the pull request adds functionality, corresponding docstrings and other
    documentation should be updated.
-1. The pull request should work for Python 3.6 and higher. GitHub Actions will
+1. The pull request should work for Python 3.7 and higher. GitHub Actions will
    display test results at the bottom of the pull request page. Check there for
    test results.
 

README.md

@@ -142,7 +142,7 @@ For more information, refer to the [documentation](https://docs.pyribs.org/).
 
 ## Installation
 
-pyribs supports Python 3.6-3.9. Earlier Python versions may work but are not
+pyribs supports Python 3.7-3.10. Earlier Python versions may work but are not
 officially supported.
 
 To install from PyPI, run

pinned_reqs/extras_all.txt

@@ -1,3 +1,3 @@
-# The reference images in the repo were created with Matplotlib 3.4.0 -- images
+# The reference images in the repo were created with Matplotlib 3.5.1 -- images
 # created with earlier versions are slightly different.
-matplotlib==3.4.0
+matplotlib==3.5.1

setup.py

@@ -44,10 +44,10 @@
         "yapf",
 
         # Testing
-        "pytest==6.1.2",
-        "pytest-cov==2.10.1",
-        "pytest-benchmark==3.2.3",
-        "pytest-xdist==2.1.0",
+        "pytest==7.0.1",
+        "pytest-cov==3.0.0",
+        "pytest-benchmark==3.4.1",
+        "pytest-xdist==2.5.0",
 
         # Documentation
         "Sphinx==3.2.1",
@@ -76,10 +76,10 @@
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Mathematics",
         "Topic :: Scientific/Engineering :: Artificial Intelligence",
@@ -95,7 +95,7 @@
     keywords="ribs",
     name="ribs",
     packages=find_packages(include=["ribs", "ribs.*"]),
-    python_requires=">=3.6.0",
+    python_requires=">=3.7.0",
     test_suite="tests",
     url="https://github.com/icaros-usc/pyribs",
     version="0.4.0",

tests/visualize_test.py

@@ -8,7 +8,7 @@
 ``test_cvt_archive_heatmap_with_samples``, run::
 
     cp result_images/visualize_test/cvt_archive_heatmap_with_samples.png \
-        tests/extras/baseline_images/visualize_test/
+        tests/baseline_images/visualize_test/
 
 Assuming the output is as expected (and assuming the code is deterministic), the
 test should now pass when it is re-run.