Merge pull request #43 from zacharylazzara/main

Fixed import error for Python 3.10+

.gitignore

@@ -81,3 +81,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+
+# macOS
+.DS_Store

alpyne/client/http_client.py

@@ -44,15 +44,15 @@ def api_request(self, url: str, method: str="GET", body: Any=None) -> RequestRes
                 if response.getcode() >= 400:  # TODO model errors should warn user and mark episode as halted
                     raise ModelError(response.getcode(), response.reason, response.read(), url_path)
                 success = True
+            except HTTPError as err:
+                raise ModelError(err.code, err.reason, err.read(), url_path)
             except URLError as err:
                 if urlErrorCounter < maxUrlErrors:
                     urlErrorCounter += 1
                     sleep(0.1)
                 else:
                     # Can either be handled from alpyne or the underlying server
-                    raise ModelError(err.code, err.reason, err.read(), url_path)
-            except HTTPError as err:
-                raise ModelError(err.code, err.reason, err.read(), url_path)
+                    raise ModelError(error=err.reason, path=url_path)
             except socket.timeout as err:
                 raise ModelError(err.errno, "timeout|model exception", "see alpyne.log", url_path)
 

alpyne/data/spaces.py

@@ -1,6 +1,9 @@
 import itertools
 import logging
-from collections import Iterable, Mapping
+try:
+    from collections.abc import Iterable, Mapping
+except ImportError:
+    from collections import Iterable, Mapping
 from datetime import datetime
 from math import ceil
 from typing import Any, Dict, List, Optional, Union, Tuple, Callable

setup.py

@@ -23,6 +23,6 @@
     python_requires='>=3',
     install_requires=[
         "gym",
-	"numpy"
+	    "numpy"
     ],
 )