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
This commit is contained in:
Shay Carter 2022-08-23 18:12:30 -06:00
parent c03df43b39
commit 2d5bc31ddf
4 changed files with 6 additions and 6 deletions

View file

@ -17,10 +17,10 @@
# values to your EnumSet. # values to your EnumSet.
## ##
import collections import collections.abc
class EnumSet(collections.MutableSet): class EnumSet(collections.abc.MutableSet):
def __init__(self, enumClassName, iterable=[]): def __init__(self, enumClassName, iterable=[]):
self.__enumClassName = enumClassName self.__enumClassName = enumClassName

View file

@ -2,7 +2,7 @@
channels: channels:
- https://conda.anaconda.org/conda-forge - https://conda.anaconda.org/conda-forge
dependencies: dependencies:
- python=3.9 - python=3
- numpy - numpy
- nomkl - nomkl
- matplotlib - matplotlib

View file

@ -10,7 +10,7 @@ dependencies = ['numpy', 'six']
if sys.version_info < (3, 4): if sys.version_info < (3, 4):
dependencies.append('enum34') dependencies.append('enum34')
ver = "18.1.10" ver = "18.1.11"
setup( setup(
name='python-awips', name='python-awips',

View file

@ -23,7 +23,7 @@ from multiprocessing import Process, Value, Condition, reduction
from .TServer import TServer from .TServer import TServer
from thrift.transport.TTransport import TTransportException from thrift.transport.TTransport import TTransportException
import collections import collections.abc
class TProcessPoolServer(TServer): class TProcessPoolServer(TServer):
@ -41,7 +41,7 @@ class TProcessPoolServer(TServer):
self.postForkCallback = None self.postForkCallback = None
def setPostForkCallback(self, callback): def setPostForkCallback(self, callback):
if not isinstance(callback, collections.Callable): if not isinstance(callback, collections.abc.Callable):
raise TypeError("This is not a callback!") raise TypeError("This is not a callback!")
self.postForkCallback = callback self.postForkCallback = callback