From be13d32dff47dfcecafcb377a127a77d2c7084be Mon Sep 17 00:00:00 2001
From: Pete R Jemian <prjemian@gmail.com>
Date: Fri, 26 Nov 2021 17:56:43 -0600
Subject: [PATCH] MNT #583 py36 - py310

---
 .github/workflows/unit-tests-pytest.yml | 3 +--
 CHANGES.rst                             | 5 +++++
 apstools/__init__.py                    | 7 ++++---
 conda/meta.yaml                         | 5 ++---
 docs/source/install.rst                 | 8 ++------
 environment.yml                         | 3 +--
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/unit-tests-pytest.yml b/.github/workflows/unit-tests-pytest.yml
index d6bf96eca..929c09ddd 100644
--- a/.github/workflows/unit-tests-pytest.yml
+++ b/.github/workflows/unit-tests-pytest.yml
@@ -8,8 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # python-version: ['3.7', '3.8', '3.9']
-        python-version: ['3.7']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
       max-parallel: 5
 
     steps:
diff --git a/CHANGES.rst b/CHANGES.rst
index 27e9c362c..a3f3e3dbd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -34,6 +34,11 @@ Breaking Changes
 Moved ``apsbss`` support to new ``apsbss`` package (install with either ``pip``
 or ``conda``).  See https://bcda-aps.github.io/apsbss/ for details.
 
+Maintenance
+---------------
+
+Now testing with Python versions 3.7 - 3.10.
+
 
 1.5.4
 ******
diff --git a/apstools/__init__.py b/apstools/__init__.py
index 115c7a34a..f74088dd2 100644
--- a/apstools/__init__.py
+++ b/apstools/__init__.py
@@ -25,7 +25,7 @@
 __platforms__ = "any"
 __zip_safe__ = False
 __exclude_project_dirs__ = "docs examples resources".split()
-__python_version_required__ = ">=3.7,<3.9"
+__python_version_required__ = ">=3.7"
 
 __package_name__ = __project__
 __long_description__ = __description__
@@ -46,8 +46,9 @@
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.7",
-    # "Programming Language :: Python :: 3.8",
-    # "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Topic :: Scientific/Engineering",
     "Topic :: Scientific/Engineering :: Astronomy",
     "Topic :: Scientific/Engineering :: Bio-Informatics",
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 91cb1447d..f83aec00a 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -32,11 +32,10 @@ build:
 
 requirements:
   host:
-    - python =3.7
+    - python >=3.7
     - pip
   run:
-    - python =3.7
-    - aps-dm-api
+    - python >=3.7
     - bluesky >=1.6.7
     - databroker >=1.2.3
     - h5py
diff --git a/docs/source/install.rst b/docs/source/install.rst
index 9f6eac167..9bb926829 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -16,10 +16,6 @@ If you are using Anaconda Python and have ``conda`` installed, install with this
 command::
 
     $ conda install -c aps-anl-tag apstools
-    $ conda install -c prjemian apstools
-
-Note that channel ``aps-anl-tag`` is for production versions while
-channel ``aps-anl-dev`` is for development/testing versions.
 
 pip
 ---
@@ -60,10 +56,10 @@ required by ``apstools``.  Most packages are available as conda packages
 from https://anaconda.org.  The others are available on
 https://PyPI.python.org.  Among the required packages:
 
-  - python>=3.6.0
-  - aps-dm-api
+  - python>=3.7
   - bluesky, databroker, ophyd
   - h5py
+  - pandas
   - pyEpics
   - pyqt=5
   - pyRestTable
diff --git a/environment.yml b/environment.yml
index c35c602d2..6dbca4c05 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,8 +5,7 @@ channels:
   - aps-anl-tag
   - nsls2forge
 dependencies:
-  - python =3.7
-  - aps-dm-api
+  - python >=3.7
   - bluesky >=1.6.7
   - databroker >=1.2.3
   - databroker-pack