upgrade dependencies to support multiplatforms

baxtree · Aug 25, 2023 · d1acda5 · d1acda5
1 parent 7be99f7
commit d1acda5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 44 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -56,34 +56,20 @@ jobs:
           tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.u20
           push: true
 
-      - name: Build and push the Ubuntu 22 AMD64 image
+      - name: Build and push the Ubuntu 22 image
         id: docker_build_u22
         uses: docker/build-push-action@v4
         with:
           context: ./docker
           file: "./docker/Dockerfile-Ubuntu22"
           build-args: |
             "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}"
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           allow: network.host
           github-token: ${{ github.token }}
           tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.u22
           push: true
 
-#      - name: Build and push the Ubuntu 22 ARM64 image
-#        id: docker_build_u22
-#        uses: docker/build-push-action@v2
-#        with:
-#          context: ./docker
-#          file: "./docker/Dockerfile-Ubuntu22-ARM64"
-#          build-args: |
-#            "RELEASE_VERSION=${{ steps.tag.outputs.TAG }}"
-#          platforms: linux/arm64
-#          allow: network.host
-#          github-token: ${{ github.token }}
-#          tags: baxtree/subaligner:${{ steps.tag.outputs.TAG }}.u22-arm64
-#          push: true
-
       - name: Build and push the Fedora 34 image
         id: docker_build_fed34
         uses: docker/build-push-action@v2

diff --git a/Pipfile b/Pipfile
@@ -39,7 +39,7 @@ filelock = "<4.0.0"
 google-pasta = "~=0.2"
 graphviz = "==0.8.3"
 HeapDict = "==1.0.0"
-h5py = "<=3.6.0"
+h5py = "<4.0.0"
 html5lib = "==1.0b9"
 hyperopt = "==0.2.4"
 idna = "==2.8"

diff --git a/docker/Dockerfile-Ubuntu22-ARM64 b/docker/Dockerfile-Ubuntu22-ARM64
diff --git a/requirements-arm64.txt b/requirements-arm64.txt
@@ -15,7 +15,7 @@ google-auth-oauthlib==0.4.2
 google-pasta~=0.2
 graphviz==0.8.3
 HeapDict==1.0.0
-h5py<=4.0.0
+h5py<4.0.0
 html5lib==1.0b9
 hyperopt==0.2.4
 idna==2.8

diff --git a/requirements.txt b/requirements.txt
@@ -14,7 +14,7 @@ filelock<4.0.0
 google-pasta~=0.2
 graphviz==0.8.3
 HeapDict==1.0.0
-h5py<=3.6.0
+h5py<4.0.0
 html5lib==1.0b9
 hyperopt==0.2.4
 idna==2.8

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 with open("README.md") as readme_file:
     readme = readme_file.read()
 
-if machine() == "arm64":
+if sys.platform == "darwin" and machine() == "arm64":
     with open("requirements-arm64.txt") as requirements_file:
         requirements = requirements_file.read().splitlines()[::-1]
 else:
@@ -50,10 +50,6 @@ def get_tag(self):
         python = f"py{sys.version_info.major}{sys.version_info.minor}"
         if sys.platform == "darwin" and architecture == "arm64":
             os_arch = "macosx_11_0_arm64"
-        elif sys.platform == "win32":
-            os_arch = "win32" if architecture == "32bit" else "win_amd64"
-        # elif sys.platform == "linux":
-        #     os_arch = f"manylinux_2_17_{architecture}"
         else:
             os_arch = "any"
         return python, "none", os_arch