Merge branch 'master' into fix-macos

Author: ruberith

.github/workflows/build-linux.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         # python-version: [3.7]
-        python-version: [cp36-cp36m, cp37-cp37m, cp38-cp38]
+        python-version: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310]
 
     steps:
     - uses: actions/checkout@v1

.github/workflows/build-windows.yml

@@ -39,15 +39,15 @@ jobs:
     strategy:
       matrix:
         # python-version: [3.7]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     # Checkout repo
     - uses: actions/checkout@v1
 
     # Set up python
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

setup.py

@@ -120,14 +120,6 @@ def build_extension(self, ext):
 splishsplash_version = f.readline().strip()
 f.close() 
 
-max_numpy_version = "1.19.3"
-install_requires = [f"numpy<={max_numpy_version}"]
-if platform.machine() == "arm64":
-    if platform.system() == "Darwin":
-        install_requires = ["numpy>=1.21.0"]
-    else:
-        install_requires = [f"numpy>=1.19.0,<={max_numpy_version}"]
-
 setup(
     name=name,
     version=splishsplash_version,
@@ -149,5 +141,5 @@ def build_extension(self, ext):
 				(emitter_boundary_dest, [s for s in emitter_boundary if os.path.isfile(s)]),
 				(fonts_dest, [f for f in fonts if os.path.isfile(f)])],
     zip_safe=False,
-    install_requires=install_requires
+    install_requires=['numpy']
 )