Run hooks on the code base.

This adds trailing lines to files, removes trailing white space in all the other lines and unifies line endings. Additionally it formats the test code with `black`.
Ananadharajan · Aug 16, 2022 · ca497f8 · ca497f8
1 parent 63b2eb1
commit ca497f8
Show file tree

Hide file tree

Showing 46 changed files with 375 additions and 338 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,2 @@
 # Migrate code style to Black
-b6a24debb78b953117a3f637db18942f370a4b85
+b6a24debb78b953117a3f637db18942f370a4b85
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-*.py diff=python
+*.py diff=python
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,8 +30,8 @@ jobs:
         black --check .
     # - name: Run PyLint (info only)
     #   run: pylint --rcfile=setup.cfg src --exit-zero
-    
-    
+
+
   test:
     timeout-minutes: 20
     runs-on: ${{ matrix.os }}

diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,3 @@ src/vorta/i18n/ts/vorta.en.ts
 src/vorta/i18n/ts/vorta.en_US.ts
 flatpak/app/
 flatpak/.flatpak-builder/
-
diff --git a/.tx/config b/.tx/config
@@ -7,4 +7,3 @@ minimum_perc = 80
 source_file = src/vorta/i18n/ts/vorta.en.ts
 source_lang = en
 type = QT
-
diff --git a/flatpak/dependencies/fuse-2.9.2-namespace-conflict-fix.patch b/flatpak/dependencies/fuse-2.9.2-namespace-conflict-fix.patch
@@ -4,7 +4,7 @@ diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_ke
 @@ -88,12 +88,16 @@
  #ifndef _LINUX_FUSE_H
  #define _LINUX_FUSE_H
- 
+
 -#include <sys/types.h>
 +#ifdef __linux__
 +#include <linux/types.h>
@@ -16,6 +16,6 @@ diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_ke
  #define __s32 int32_t
  #define __u16 uint16_t
 +#endif
- 
+
  /*
   * Version negotiation:
diff --git a/flatpak/dependencies/fuse-disable-sys-mount-under-flatpak.patch b/flatpak/dependencies/fuse-disable-sys-mount-under-flatpak.patch
@@ -14,13 +14,12 @@ index 7a18c11..1667db2 100644
 @@ -392,6 +392,9 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
  	int fd;
  	int res;
- 
+
 +	/* disable in flatpak */
 +	return -2;
 +
  	if (!mnt) {
  		fprintf(stderr, "fuse: missing mountpoint parameter\n");
  		return -1;
--- 
+--
 2.17.0.rc2
-
diff --git a/flatpak/dependencies/pyqt5.json b/flatpak/dependencies/pyqt5.json
@@ -41,4 +41,4 @@
             ]
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-appdirs.json b/flatpak/dependencies/python3-appdirs.json
@@ -11,4 +11,4 @@
             "sha256": "d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e"
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-paramiko.json b/flatpak/dependencies/python3-paramiko.json
@@ -61,4 +61,4 @@
             "sha256": "a8975a7df3560c9f1e2b43dc54ebd40fd00a7017392ca5445ce7df409f900fcb"
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-peewee.json b/flatpak/dependencies/python3-peewee.json
@@ -11,4 +11,4 @@
             "sha256": "f3f5c80c51b632d031f60454accadd84f166453a471bff63093ca674973f2a4e"
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-psutil.json b/flatpak/dependencies/python3-psutil.json
@@ -11,4 +11,4 @@
             "sha256": "863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3"
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-setuptools.json b/flatpak/dependencies/python3-setuptools.json
@@ -67,4 +67,4 @@
             ]
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-setuptools_git.json b/flatpak/dependencies/python3-setuptools_git.json
@@ -11,4 +11,4 @@
             "sha256": "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445"
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-setuptools_scm.json b/flatpak/dependencies/python3-setuptools_scm.json
@@ -11,4 +11,4 @@
             "sha256": "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358"
         }
     ]
-}
+}
diff --git a/flatpak/dependencies/python3-wheels.json b/flatpak/dependencies/python3-wheels.json
@@ -75,4 +75,4 @@
             "sources": []
         }
     ]
-}
+}
diff --git a/package/entitlements.plist b/package/entitlements.plist
@@ -10,4 +10,4 @@
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
 </dict>
-</plist>
+</plist>
diff --git a/package/vorta.spec b/package/vorta.spec
@@ -81,4 +81,3 @@ app = BUNDLE(coll,
                              'PATH': '/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin'
                          }
              })
-
diff --git a/src/vorta/assets/icons/broom-solid.svg b/src/vorta/assets/icons/broom-solid.svg
diff --git a/src/vorta/assets/icons/folder-on-top.svg b/src/vorta/assets/icons/folder-on-top.svg
diff --git a/src/vorta/assets/icons/folder.svg b/src/vorta/assets/icons/folder.svg
diff --git a/src/vorta/assets/icons/minus.svg b/src/vorta/assets/icons/minus.svg
diff --git a/src/vorta/assets/icons/paste.svg b/src/vorta/assets/icons/paste.svg
diff --git a/src/vorta/i18n/ts/vorta.cs.ts b/src/vorta/i18n/ts/vorta.cs.ts
@@ -1357,11 +1357,11 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
         <translation>Aktualizace schématu se nezdařila, vyplňte hlášení chyby s odkazem v panelu Různé s následující chybou:
- {0} 
+ {0}
  {1}</translation>
     </message>
     <message>
@@ -2128,4 +2128,4 @@ Zkuste repozitář odpojit a znovu přidat.</translation>
         <translation>Je třeba, aby heslo bylo delší než 8 znaků.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.de.ts b/src/vorta/i18n/ts/vorta.de.ts
@@ -1355,11 +1355,11 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
-        <translation>Schema-Upgrade Fehler, erstelle einen Bugreport auf dem Link um &quot;Misc&quot;-Tab, mit folgendem Fehler: 
- {0} 
+        <translation>Schema-Upgrade Fehler, erstelle einen Bugreport auf dem Link um &quot;Misc&quot;-Tab, mit folgendem Fehler:
+ {0}
  {1}</translation>
     </message>
     <message>
@@ -2125,4 +2125,4 @@ Try unlinking and re-adding your repo.</source>
         <translation>Passwörter müssen länger als 8 Zeichen sein.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.es.ts b/src/vorta/i18n/ts/vorta.es.ts
@@ -1357,8 +1357,8 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
         <translation>Falla al actualizar esquema, registre un reporte de error con el enlace en la pestaña Varios con el siguiente error:
 {0}
@@ -2128,4 +2128,4 @@ Intente desvincular y volver a agregar su repositorio.</translation>
         <translation>Las contraseñas deben ser mayor a 8 caracteres.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.fi.ts b/src/vorta/i18n/ts/vorta.fi.ts
@@ -1357,11 +1357,11 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
-        <translation>Skeeman päivitys epäonnistui, lähetä virheraportti Sekalaiset-välilehdellä olevasta linkistä. Liitä raporttiin seuraavat tiedot: 
- {0} 
+        <translation>Skeeman päivitys epäonnistui, lähetä virheraportti Sekalaiset-välilehdellä olevasta linkistä. Liitä raporttiin seuraavat tiedot:
+ {0}
  {1}</translation>
     </message>
     <message>
@@ -2128,4 +2128,4 @@ Poista tietovaraston linkitys ja lisää se uudelleen.</translation>
         <translation>Salasanojen tulee olla pidempiä kuin 8 merkkiä.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.fr.ts b/src/vorta/i18n/ts/vorta.fr.ts
@@ -1354,11 +1354,11 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
-        <translation>Échec de la mise à niveau de la base de donnée, veuillez remplir un rapport de bug en utilisant le lien dans l&apos;onglet Divers avec l&apos;erreur suivante : 
-{0} 
+        <translation>Échec de la mise à niveau de la base de donnée, veuillez remplir un rapport de bug en utilisant le lien dans l&apos;onglet Divers avec l&apos;erreur suivante :
+{0}
 {1}</translation>
     </message>
     <message>
@@ -2125,4 +2125,4 @@ Essayez de dissocier et d&apos;ajouter le dépôt à nouveau.</translation>
         <translation>Les mots de passe doivent faire plus de 8 caractères.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.gl.ts b/src/vorta/i18n/ts/vorta.gl.ts
@@ -1210,11 +1210,11 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="77"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
         <translation>Produciuse u fallo na actualización do esquema, presenta un informe de erro coa ligazón na lapela Varios co seguinte erro:
-{0} 
+{0}
 {1}</translation>
     </message>
     <message>
@@ -1837,4 +1837,4 @@ Probe a desvincular e engadir de novo o repositorio.</translation>
         <translation>Os contrasinais deben ter máis de 8 caracteres.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.it.ts b/src/vorta/i18n/ts/vorta.it.ts
@@ -1409,4 +1409,4 @@
         <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.nl.ts b/src/vorta/i18n/ts/vorta.nl.ts
@@ -1357,8 +1357,8 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
         <translation>Het schema kan niet worden bijgewerkt. Stel een bugmelding op via de link op het tabblad ‘Overig’. Stuur de volgende informatie mee:
 
@@ -2129,4 +2129,4 @@ Herkoppel je repo.</translation>
         <translation>De wachtwoorden moeten meer dan 8 tekens bevatten.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.ru.ts b/src/vorta/i18n/ts/vorta.ru.ts
@@ -1210,11 +1210,11 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="77"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
-        <translation>Сбой обновления схемы. Отправьте сообщение об ошибке по ссылке на вкладке Разное со следующим текстом ошибки: 
- {0} 
+        <translation>Сбой обновления схемы. Отправьте сообщение об ошибке по ссылке на вкладке Разное со следующим текстом ошибки:
+ {0}
  {1}</translation>
     </message>
     <message>
@@ -1889,4 +1889,4 @@ Try unlinking and re-adding your repo.</source>
         <translation>Пароль должен быть длиннее 8 символов.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.sk.ts b/src/vorta/i18n/ts/vorta.sk.ts
@@ -1357,8 +1357,8 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="75"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
         <translation>Upgrade schémy skončil s chybou, otvorte hlásenie o chybe kliknutím na odkaz na karte Rôzne a skopírujte tento text:
 {0}
@@ -2128,4 +2128,4 @@ Skúste tento repozitár odpojiť a opäť pridať.</translation>
         <translation>Heslá musia obsahovať aspoň 8 znakov.</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/src/vorta/i18n/ts/vorta.sv.ts b/src/vorta/i18n/ts/vorta.sv.ts
@@ -1210,8 +1210,8 @@
     </message>
     <message>
         <location filename="../../views/import_window.py" line="77"/>
-        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error: 
- {0} 
+        <source>Schema upgrade failure, file a bug report with the link in the Misc tab with the following error:
+ {0}
  {1}</source>
         <translation>Schemauppgraderingsfel, skicka en felrapport med hjälp av länken i diversefliken och ange följande fel:
  {0}
@@ -1890,4 +1890,4 @@ Försök avlänka och återansluta ditt förråd.</translation>
         <translation>Lösenord måste vara längre än 8 tecken.</translation>
     </message>
 </context>
-</TS>
+</TS>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,3 @@ src/vorta/i18n/ts/vorta.en.ts
		src/vorta/i18n/ts/vorta.en_US.ts
		flatpak/app/
		flatpak/.flatpak-builder/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ minimum_perc = 80
		source_file = src/vorta/i18n/ts/vorta.en.ts
		source_lang = en
		type = QT
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,4 @@ @@
                 ]
             }
         ]
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,4 +81,3 @@ app = BUNDLE(coll,
		'PATH': '/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin'
		}
		})