Development

.github/workflows/constraints.txt

@@ -1,3 +1,3 @@
-pip==23.0.1
-poetry==1.4.2
-virtualenv==20.21.0
+pip==23.2
+poetry==1.5.1
+virtualenv==20.24.1

.github/workflows/release.yml

@@ -57,21 +57,21 @@ jobs:
 
       - name: Publish package on PyPI
         if: steps.check-version.outputs.tag
-        uses: pypa/gh-action-pypi-publish@v1.8.5
+        uses: pypa/gh-action-pypi-publish@v1.8.8
         with:
           user: __token__
           password: "${{ secrets.PYPI_TOKEN }}"
 
       - name: Publish package on TestPyPI
         if: "! steps.check-version.outputs.tag"
-        uses: pypa/gh-action-pypi-publish@v1.8.5
+        uses: pypa/gh-action-pypi-publish@v1.8.8
         with:
           user: __token__
           password: "${{ secrets.TEST_PYPI_TOKEN }}"
           repository_url: https://test.pypi.org/legacy/
 
       - name: Publish the release notes
-        uses: release-drafter/release-drafter@v5.23.0
+        uses: release-drafter/release-drafter@v5.24.0
         with:
           publish: "${{ steps.check-version.outputs.tag != '' }}"
           tag: "${{ steps.check-version.outputs.tag }}"

jdk/client/adoptium.py

@@ -110,6 +110,11 @@ def get_download_url(
 
         if arch is None:
             arch = Architecture.detect()
+        arch = AdoptiumArchitecture.transform(arch)
+
+        # Handle edge case for MacOS w/Apple M1 or M2
+        if operating_system is OperatingSystem.MAC and arch == AdoptiumArchitecture.ARM:
+            arch = AdoptiumArchitecture.AARCH64
 
         if jre:
             image_type = ImageType.JRE

jdk/client/client.py

@@ -1,4 +1,3 @@
-import cgi
 import shutil
 import tempfile
 from collections.abc import Iterable
@@ -52,12 +51,10 @@ def download(self, download_url: str) -> Optional[str]:
 
         jdk_file = None
         with request.urlopen(req) as open_request:  # noqa: S310
-            info = open_request.info()
-            if "Content-Disposition" in info:
-                content_disposition = info["Content-Disposition"]
-                _, params = cgi.parse_header(content_disposition)
-                if "filename" in params:
-                    jdk_file = params["filename"]
+            headers = open_request.headers
+            content_disposition = headers.get_content_disposition()
+            if content_disposition:
+                jdk_file = headers.get_filename()
             else:
                 url_path = urlsplit(download_url).path
                 jdk_file = path.basename(url_path)