Merge pull request #312 from Nitrokey/fix-pyinstaller-build-dependencies

mmerklinger · web-flow · commit bdebfa24826d · 2024-11-19T15:00:33.000+01:00
Remove `ecdsa` dependency from pyinstaller build
diff --git a/ci-scripts/linux/pyinstaller/nitrokey-app-onedir.spec b/ci-scripts/linux/pyinstaller/nitrokey-app-onedir.spec
@@ -11,7 +11,6 @@ datas = [
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/linux/pyinstaller/nitrokey-app-onefile.spec b/ci-scripts/linux/pyinstaller/nitrokey-app-onefile.spec
@@ -11,7 +11,6 @@ datas = [
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec
@@ -11,7 +11,6 @@ datas = [
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_intel64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_intel64.spec
@@ -11,7 +11,6 @@ datas = [
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_arm64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_arm64.spec
@@ -11,7 +11,6 @@ datas = [
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_intel64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_intel64.spec
@@ -11,7 +11,6 @@ datas = [
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/windows/pyinstaller/nitrokey-app-onedir.spec b/ci-scripts/windows/pyinstaller/nitrokey-app-onedir.spec
@@ -9,7 +9,6 @@ datas = [
     ('..\\..\\..\\nitrokeyapp\\ui', 'nitrokeyapp\\ui'),
     ('..\\..\\..\\LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')
diff --git a/ci-scripts/windows/pyinstaller/nitrokey-app-onefile.spec b/ci-scripts/windows/pyinstaller/nitrokey-app-onefile.spec
@@ -9,7 +9,6 @@ datas = [
     ('..\\..\\..\\nitrokeyapp\\ui', 'nitrokeyapp\\ui'),
     ('..\\..\\..\\LICENSE', '.')
 ]
-datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
 datas += copy_metadata('nitrokey')

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ datas = [`
`11`	`11`	`('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),`
`12`	`12`	`('../../../LICENSE', '.')`
`13`	`13`	`]`
`14`		`-datas += copy_metadata('ecdsa')`
`15`	`14`	`datas += copy_metadata('fido2')`
`16`	`15`	`datas += copy_metadata('nitrokeyapp')`
`17`	`16`	`datas += copy_metadata('nitrokey')`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ datas = [`
`9`	`9`	`('..\\..\\..\\nitrokeyapp\\ui', 'nitrokeyapp\\ui'),`
`10`	`10`	`('..\\..\\..\\LICENSE', '.')`
`11`	`11`	`]`
`12`		`-datas += copy_metadata('ecdsa')`
`13`	`12`	`datas += copy_metadata('fido2')`
`14`	`13`	`datas += copy_metadata('nitrokeyapp')`
`15`	`14`	`datas += copy_metadata('nitrokey')`