From 6eae3405fd7ba5883448c09d9690f58c0542e8d7 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 7 Apr 2020 17:39:24 +0300
Subject: [PATCH] Add hidden import for newer version of setuptools

---
 pyfa.spec            | 3 ++-
 scripts/setup-osx.sh | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pyfa.spec b/pyfa.spec
index e6079757f..dc121ce20 100644
--- a/pyfa.spec
+++ b/pyfa.spec
@@ -51,7 +51,8 @@ if os_name == 'Darwin':
 
 import_these = [
     'numpy.core._dtype_ctypes',  # https://github.com/pyinstaller/pyinstaller/issues/3982
-    'sqlalchemy.ext.baked'  # windows build doesn't launch without if when using sqlalchemy 1.3.x
+    'sqlalchemy.ext.baked',  # windows build doesn't launch without if when using sqlalchemy 1.3.x
+    'pkg_resources.py2_warn'  # issue 2156
 ]
 
 # Walk directories that do dynamic importing
diff --git a/scripts/setup-osx.sh b/scripts/setup-osx.sh
index b214f2fda..d3a2d1966 100644
--- a/scripts/setup-osx.sh
+++ b/scripts/setup-osx.sh
@@ -3,9 +3,6 @@ echo "Python version:"
 python3 --version
 echo "Upgrading pip..."
 python3 -m pip install --upgrade pip
-# See issue #2156
-echo "Upgrading setuptools..."
-python3 -m pip install --upgrade setuptools
 echo "Installing app requirements..."
 python3 -m pip install -r requirements.txt
 echo "Installing packaging tools..."