Merge branch 'Nitrokey:master' into help-patch

Nitrokey · Apr 15, 2024 · 2ed8c16 · 2ed8c16
2 parents a0ce779 + 600527e
commit 2ed8c16
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 29 deletions.
diff --git a/.github/workflows/cd-linux.yaml b/.github/workflows/cd-linux.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check version tag format
         run: |
           TAG_VERSION="${{ github.event.release.tag_name }}"
@@ -29,24 +29,30 @@ jobs:
     needs: version-check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update
-          apt install -y binutils gcc libpcsclite-dev libusb-1.0-0 make swig
+          apt install -y binutils gcc git libpcsclite-dev libusb-1.0-0 make swig
       - name: Create virtual environment
         run: |
           python -m venv venv
           . venv/bin/activate
           pip install flit
           flit install --symlink
+      - name: Patch oscrypto
+        run: |
+          . venv/bin/activate
+          pip uninstall -y oscrypto
+          : # This uses an oscrypto version to avoid issue #431
+          pip install "oscrypto @ git+https://github.com/wbond/oscrypto.git@1547f535001ba568b239b8797465536759c742a3"
       - name: Build
         run: |
           . venv/bin/activate
           pyinstaller \
             ci-scripts/linux/pyinstaller/pynitrokey-onefile.spec
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nitropy-onefile
           path: dist/nitropy
@@ -59,7 +65,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nitropy-onefile
       - name: Rename binary
@@ -74,6 +80,6 @@ jobs:
           nitropy-${{ github.event.release.tag_name }}-x64-linux-binary.tar.gz \
           nitropy-${{ github.event.release.tag_name }}-x64-linux-binary
       - name: Publish release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: nitropy-${{ github.event.release.tag_name }}-x64-linux-binary.tar.gz
diff --git a/.github/workflows/cd-pypi.yaml b/.github/workflows/cd-pypi.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check version tag format
         run: |
           TAG_VERSION="${{ github.event.release.tag_name }}"
@@ -29,7 +29,7 @@ jobs:
     needs: version-check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update
@@ -45,7 +45,7 @@ jobs:
           . venv/bin/activate
           flit build
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nitropy-pypi
           path: dist
@@ -56,11 +56,11 @@ jobs:
     needs: build
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nitropy-pypi
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update

diff --git a/.github/workflows/cd-windows.yaml b/.github/workflows/cd-windows.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check version tag format
         run: |
           $VERSION_TAG="${{ github.event.release.tag_name }}"
@@ -29,7 +29,7 @@ jobs:
     needs: version-check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create virtual environment
         run: |
           python -m venv venv
@@ -49,7 +49,7 @@ jobs:
           .\venv\Scripts\Activate.ps1
           pyinstaller ci-scripts/windows/pyinstaller/pynitrokey-onedir.spec
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pynitrokey-onedir
           path: dist/nitropy
@@ -59,7 +59,7 @@ jobs:
     needs: version-check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create virtual environment
         run: |
           python -m venv venv
@@ -79,7 +79,7 @@ jobs:
           .\venv\Scripts\Activate.ps1
           pyinstaller ci-scripts/windows/pyinstaller/pynitrokey-onefile.spec
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pynitrokey-onefile
           path: dist/nitropy.exe
@@ -89,9 +89,9 @@ jobs:
     needs: build-onedir
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: pynitrokey-onedir
           path: dist/nitropy
@@ -127,7 +127,7 @@ jobs:
             .\Sources.wixobj `
             -o nitropy.msi
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nitropy-installer
           path: nitropy.msi
@@ -139,7 +139,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: pynitrokey-onefile
       - name: Rename binary
@@ -153,7 +153,7 @@ jobs:
             nitropy-${{ github.event.release.tag_name }}-x64-windows-binary.zip `
             nitropy-${{ github.event.release.tag_name }}-x64-windows-binary.exe
       - name: Publish release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: nitropy-${{ github.event.release.tag_name }}-x64-windows-binary.zip
   publish-msi-installer:
@@ -164,7 +164,7 @@ jobs:
       contents: write
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nitropy-installer
       - name: Rename installer
@@ -173,6 +173,6 @@ jobs:
             nitropy.msi `
             nitropy-${{ github.event.release.tag_name }}-x64-windows-installer.msi
       - name: Publish release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: nitropy-${{ github.event.release.tag_name }}-x64-windows-installer.msi
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
     container: python:3.9-slim
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update
@@ -32,7 +32,7 @@ jobs:
     container: python:3.9-slim
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update
@@ -49,7 +49,7 @@ jobs:
     container: python:3.9-slim
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update
@@ -66,7 +66,7 @@ jobs:
     container: python:3.9-slim
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install required packages
         run: |
           apt update

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -2,3 +2,4 @@ Current maintainers (with OpenPGP keys):
 - Szczepan Zalega szczepan@nitrokey.com D9BAE35991DE5B22 (@szszszsz)
 - Markus Meissner meissner@nitrokey.com 44CB2D868DD16BDA (@daringer)
 - Robin Krahl robin@nitrokey.com 719EA31C3F1814DA787C8FD434F47D2F044B8F17 (@robin-nitrokey)
+- Sosthène Guédon sosthene@nitrokey.com 93CCB0DB717DAE30622F671436DA48A4C827B354 (@sosthene-nitrokey)
diff --git a/pynitrokey/VERSION b/pynitrokey/VERSION
@@ -1 +1 @@
-0.4.45
+0.4.46
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,6 +18,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "certifi >= 14.5.14",
@@ -51,7 +52,7 @@ dev = [
   "ipython",
   "isort",
   "mypy >=1.4,<1.5",
-  "pyinstaller ==5.9.0",
+  "pyinstaller ~=6.5.0",
   "pyinstaller-versionfile ==2.1.1; sys_platform=='win32'",
   "types-requests",
   "types-tqdm",