From 8b763a9af931a4f58edad3bddaf44ae3dd270480 Mon Sep 17 00:00:00 2001
From: Manu <3916435+m3nu@users.noreply.github.com>
Date: Fri, 24 Dec 2021 14:16:52 +0400
Subject: [PATCH] Remove unused setuptools-git dependency (#1147)

* Remove unused setuptools-git dependency
* Exclude macOS and pip temp files
---
 MANIFEST.in | 2 ++
 setup.cfg   | 8 +++++++-
 setup.py    | 9 ++-------
 3 files changed, 11 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 setup.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 6d93ee89..97006352 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,3 +5,5 @@ recursive-include src/vorta/i18n/qm *.qm
 exclude src/vorta/i18n/qm/vorta.en.qm
 
 recursive-exclude tests *
+global-exclude *.DS_Store
+global-exclude *.egg-info
diff --git a/setup.cfg b/setup.cfg
index ae36910b..4041f15c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,10 +31,13 @@ project_urls =
     Source Code = https://github.com/borgbase/vorta
 
 [options]
+packages = find:
+package_dir =
+    =src
+include_package_data = true
 python_requires = >=3.7
 setup_requires =
   pip >= 10
-  setuptools_git
 install_requires =
   appdirs
   paramiko
@@ -55,6 +58,9 @@ tests_require =
 gui_scripts =
   vorta = vorta.__main__:main
 
+[options.packages.find]
+where=src
+
 [tool:pytest]
 addopts = -vs
 testpaths = tests
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index c80a660c..60684932
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,3 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 
-setup(
-    include_package_data=True,
-    packages=find_packages('src'),
-    package_dir={'': 'src'},
-    package_data={'vorta.i18n': ['qm/*.qm']}
-)
+setup()