From 13e74f2c575ae56731e2e4a1e8ff68dba4536786 Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Sun, 9 Jun 2024 15:28:27 -0400
Subject: [PATCH] [2255] Replace Infi Systray with simplesystray

---
 EDMCLogging.py       | 2 --
 EDMarketConnector.py | 4 ++--
 requirements-dev.txt | 2 +-
 requirements.txt     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/EDMCLogging.py b/EDMCLogging.py
index ab53dbec..b6d4b353 100644
--- a/EDMCLogging.py
+++ b/EDMCLogging.py
@@ -101,8 +101,6 @@ logging.Logger.trace = lambda self, message, *args, **kwargs: self._log(  # type
 logging.Formatter.converter = gmtime
 
 warnings.simplefilter('default', DeprecationWarning)
-# TODO remove after infi.systray drops pkg_resources
-warnings.filterwarnings('ignore', '.*pkg_resources', DeprecationWarning)
 
 
 def _trace_if(self: logging.Logger, condition: str, message: str, *args, **kwargs) -> None:
diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index e1524b00..cd76ccc0 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -396,7 +396,7 @@ if TYPE_CHECKING:
     from logging import TRACE  # type: ignore # noqa: F401 # Needed to update mypy
 
     if sys.platform == 'win32':
-        from infi.systray import SysTrayIcon
+        from simplesystray import SysTrayIcon
     # isort: on
 
 
@@ -452,7 +452,7 @@ class AppWindow:
         self.prefsdialog = None
 
         if sys.platform == 'win32':
-            from infi.systray import SysTrayIcon
+            from simplesystray import SysTrayIcon
 
             def open_window(systray: 'SysTrayIcon') -> None:
                 self.w.deiconify()
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 19e55b66..7c8e1ef5 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -5,7 +5,7 @@ wheel
 # We can't rely on just picking this up from either the base (not venv),
 # or venv-init-time version.  Specify here so that dependabot will prod us
 # about new versions.
-setuptools==69.2.0
+setuptools==70.0.0
 
 # Static analysis tools
 flake8==7.0.0
diff --git a/requirements.txt b/requirements.txt
index 83fa9c0d..22f0a360 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 requests==2.32.3
 pillow==10.3.0
 watchdog==4.0.0
-infi.systray==0.1.12; sys_platform == 'win32'
+simplesystray==0.1.0; sys_platform == 'win32'
 semantic-version==2.10.0