From b2bde4f95981104640fbbcf3cce0329c7f36aaba Mon Sep 17 00:00:00 2001
From: George Steel <george.steel@gmail.com>
Date: Sun, 2 Oct 2022 20:52:34 -0400
Subject: [PATCH] fix requirements.txt, move CI version pins to CI file

---
 .github/workflows/build.yml | 13 +++++--------
 requirements.txt            | 21 ++++++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 778bd3aa7..f30fabdf1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.8.5'
+          python-version: '3.8.x'
       - uses: actions/setup-node@v1
         with:
           node-version: '16.x'
@@ -68,9 +68,7 @@ jobs:
           python -m pip install pycairo
           python -m pip install PyGObject
 
-          # colormath - last official release: 3.0.0
-          # we need already submitted fixes - so let's grab them from the github repository
-          python -m pip install git+https://github.com/gtaylor/python-colormath
+          python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.1.1-cp38-cp38-linux_x86_64.whl
 
           python -m pip install -r requirements.txt
           python -m pip install pyinstaller
@@ -108,11 +106,10 @@ jobs:
       - name: install dependencies
         shell: bash
         run: |
+          git config --system core.longpaths true
           python -m pip install --upgrade pip
           python -m pip install wheel
-
-          python -m pip install git+https://github.com/gtaylor/python-colormath
-
+          python -m pip install wxpython==4.1.1
           python -m pip install -r requirements.txt
           python -m pip install pyinstaller
 
@@ -171,7 +168,7 @@ jobs:
           pip --version
           pip install wheel
           pip install PyGObject
-          pip install git+https://github.com/gtaylor/python-colormath
+          pip install wxpython==4.1.1
           pip install -r requirements.txt
           # with --no-binary argument may fix notary issues as well shapely speedups error issue
           pip install -U lxml --no-binary lxml
diff --git a/requirements.txt b/requirements.txt
index c18e7fb05..91b88b8ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,13 @@
 ./pyembroidery
 
-# This installs inkex, the Inkscape python extension library.
-# We need the new style handling that was added after the inkex version bundled
-# with Inkscape 1.1.  That's why we're installing from Git.
--e git+https://gitlab.com/inkscape/extensions.git@e44fdcbe6bcc917ef3a2164eb0c130f7276fb83f#egg=inkex
+# inkex is not currently uploaded to pypi, the version there is extremely out of date
+inkex @ git+https://gitlab.com/inkscape/extensions.git@EXTENSIONS_AT_INKSCAPE_1.2.1
+
+# lower bound to allow for the use of system packages on Debian and distros that have updated to 4.2
+# CI adds an == 4.1.1 constraint for prebuilt packages
+wxPython>=4.1.1
 
 backports.functools_lru_cache
-https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.1.1-cp38-cp38-linux_x86_64.whl ; sys_platform == 'linux'
-wxPython==4.1.1 ; sys_platform == 'darwin'
-wxPython==4.1.1 ; sys_platform == 'win32'
 networkx
 shapely
 lxml
@@ -16,12 +15,16 @@ appdirs
 numpy
 jinja2>2.9
 requests
-colormath
+
+# colormath - last official release: 3.0.0
+# we need already submitted fixes - so let's grab them from the github repository
+colormath @ git+https://github.com/gtaylor/python-colormath.git@4a076831fd5136f685aa7143db81eba27b2cd19a
+
 stringcase
 tinycss2
 flask
 fonttools
-trimesh
+trimesh>=3.15.2
 scipy
 
 pywinutils ; sys_platform == 'win32'