From 24f827875c6ba513f12ed09a3aef2bbed223760d Mon Sep 17 00:00:00 2001
From: bashonly <88596187+bashonly@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:31:32 -0600
Subject: [PATCH] [build] Make `secretstorage` an optional dependency (#8585)

Authored by: bashonly
---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/release.yml | 4 ++--
 requirements.txt              | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b513e88e3..a52973ea25 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -204,11 +204,11 @@ jobs:
             apt -y install zlib1g-dev python3.8 python3.8-dev python3.8-distutils python3-pip
             python3.8 -m pip install -U pip setuptools wheel
             # Cannot access requirements.txt from the repo directory at this stage
-            python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi
+            python3.8 -m pip install -U Pyinstaller mutagen pycryptodomex websockets brotli certifi secretstorage
 
           run: |
             cd repo
-            python3.8 -m pip install -U Pyinstaller -r requirements.txt  # Cached version may be out of date
+            python3.8 -m pip install -U Pyinstaller secretstorage -r requirements.txt  # Cached version may be out of date
             python3.8 devscripts/update-version.py -c "${{ inputs.channel }}" -r "${{ needs.process.outputs.origin }}" "${{ inputs.version }}"
             python3.8 devscripts/make_lazy_extractors.py
             python3.8 pyinst.py
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6c59626eaa..84e892ffe1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -216,8 +216,8 @@ jobs:
         if: |
           !inputs.prerelease && env.target_repo == github.repository
         run: |
-          git config --global user.name github-actions
-          git config --global user.email github-actions@github.com
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add -u
           git commit -m "Release ${{ env.version }}" \
             -m "Created by: ${{ github.event.sender.login }}" -m ":ci skip all :ci run dl"
diff --git a/requirements.txt b/requirements.txt
index 4d23107253..5b6270a7da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,3 @@ brotlicffi; implementation_name!='cpython'
 certifi
 requests>=2.31.0,<3
 urllib3>=1.26.17,<3
-secretstorage; sys_platform=='linux' and (implementation_name!='pypy' or implementation_version>='7.3.10')