From 2d5bc31ddffa919f991532993def8b930cc70efd Mon Sep 17 00:00:00 2001
From: Shay Carter <srcarter@ucar.edu>
Date: Tue, 23 Aug 2022 18:12:30 -0600
Subject: [PATCH] Changes to make python-awips compatible with Python3.10 -
 change collections import to collections.abc - change specific class
 reference from collections.[class_name] to collections.abc.[class_name] -
 change environment file back to specifying Python3, instead of exactly
 specifying 3.9 - roll version number in setup.py

---
 dynamicserialize/dstypes/java/util/EnumSet.py | 4 ++--
 environment.yml                               | 2 +-
 setup.py                                      | 2 +-
 thrift/server/TProcessPoolServer.py           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dynamicserialize/dstypes/java/util/EnumSet.py b/dynamicserialize/dstypes/java/util/EnumSet.py
index 1e93c54..35ff3fa 100644
--- a/dynamicserialize/dstypes/java/util/EnumSet.py
+++ b/dynamicserialize/dstypes/java/util/EnumSet.py
@@ -17,10 +17,10 @@
 # values to your EnumSet.
 ##
 
-import collections
+import collections.abc
 
 
-class EnumSet(collections.MutableSet):
+class EnumSet(collections.abc.MutableSet):
 
     def __init__(self, enumClassName, iterable=[]):
         self.__enumClassName = enumClassName
diff --git a/environment.yml b/environment.yml
index 3252703..ff653d4 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,7 @@
  channels:
    - https://conda.anaconda.org/conda-forge
  dependencies:
-   - python=3.9
+   - python=3
    - numpy
    - nomkl
    - matplotlib
diff --git a/setup.py b/setup.py
index b27c522..c96ea66 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ dependencies = ['numpy', 'six']
 if sys.version_info < (3, 4):
     dependencies.append('enum34')
 
-ver = "18.1.10"
+ver = "18.1.11"
 
 setup(
     name='python-awips',
diff --git a/thrift/server/TProcessPoolServer.py b/thrift/server/TProcessPoolServer.py
index 3714ead..e8b2c9c 100644
--- a/thrift/server/TProcessPoolServer.py
+++ b/thrift/server/TProcessPoolServer.py
@@ -23,7 +23,7 @@ from multiprocessing import  Process, Value, Condition, reduction
 
 from .TServer import TServer
 from thrift.transport.TTransport import TTransportException
-import collections
+import collections.abc
 
 
 class TProcessPoolServer(TServer):
@@ -41,7 +41,7 @@ class TProcessPoolServer(TServer):
         self.postForkCallback = None
 
     def setPostForkCallback(self, callback):
-        if not isinstance(callback, collections.Callable):
+        if not isinstance(callback, collections.abc.Callable):
             raise TypeError("This is not a callback!")
         self.postForkCallback = callback