From 91276aa99c483798c70f83fbcc8754b2ba668c29 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 18:12:17 +0000 Subject: [PATCH 1/3] windows-build: Try out pre-release py2exe w/ semantic_version==2.9.0 --- requirements-dev.txt | 4 +++- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e98c5953..fd8478b8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -30,7 +30,9 @@ grip==4.6.0 # Used to put together a WiX configuration from template/auto-gen lxml==4.7.1 # We only need py2exe on windows. -py2exe==0.11.0.1; sys_platform == 'win32' +# Pre-release version addressing semantic_version 2.9.0+ issues: +# +py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.0.0 diff --git a/requirements.txt b/requirements.txt index 479425c9..402c5a86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ watchdog==2.1.6 infi.systray==0.1.12; sys_platform == 'win32' # argh==0.26.2 watchdog dep # pyyaml==5.3.1 watchdog dep -semantic-version==2.8.5 +semantic-version==2.9.0 # Base requirement for MacOS pyobjc; sys_platform == 'darwin' From 447908fd0c977793c5048f21707b1ad980dc69c0 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 22:37:46 +0000 Subject: [PATCH 2/3] requirements-dev.txt: Start listing setuptools explicitly It turned out that the "fixes semantic_version 2.9.0" version of py2exe then has an issue with infi.systray because I was still using `setuptools==60.6.0`, as that's what was latest when I last did anything to cause its installation in my venv. So, list it explicitly on the latest version, which works with py2exe from , and then dependabot should prod us to keep it up to date. --- requirements-dev.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index fd8478b8..8086867d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,6 +2,11 @@ # Using legacy 'setup.py install' for flake8-annotations-coverage, since package 'wheel' is not installed. 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. +setupttools=60.8.2 + # Static analysis tools flake8==4.0.1 flake8-annotations-coverage==0.0.5 From 8489ceeffc1c468826f9f57267be4f122b2a3b91 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 12 Feb 2022 22:42:18 +0000 Subject: [PATCH 3/3] requirements-dev: Fix setupttools= typos --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8086867d..88f68a80 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. -setupttools=60.8.2 +setuptools==60.8.2 # Static analysis tools flake8==4.0.1