Philipp Hörist pushed to branch master at gajim / gajim
Commits:
ec582a43 by mimi89999 at 2024-05-03T19:43:51+00:00
other: Apply MSYS2 setuptools workaround for all pip installs
- - - - -
2 changed files:
- win/_base.sh
- win/dev_env.sh
Changes:
=====================================
win/_base.sh
=====================================
@@ -104,16 +104,17 @@ function install_deps {
PIP_REQUIREMENTS="\
git+https://dev.gajim.org/gajim/python-nbxmpp.git
+git+https://dev.gajim.org/gajim/omemo-dr.git
python-gnupg
qrcode
css_parser
sentry-sdk
emoji
"
-
- build_pip install precis-i18n
- SETUPTOOLS_USE_DISTUTILS=stdlib build_pip install
git+https://dev.gajim.org/gajim/omemo-dr.git
- build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
+ # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/11490
+ # Env variable described in https://www.msys2.org/docs/python/
+ SETUPTOOLS_USE_DISTUTILS=stdlib build_pip install precis-i18n
+ SETUPTOOLS_USE_DISTUTILS=stdlib build_pip install $(echo
"$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
# remove the large png icons, they should be used rarely and svg works fine
rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512"
=====================================
win/dev_env.sh
=====================================
@@ -45,6 +45,7 @@ function main {
PIP_REQUIREMENTS="\
git+https://dev.gajim.org/gajim/python-nbxmpp.git
+git+https://dev.gajim.org/gajim/omemo-dr.git
pygobject-stubs --no-cache-dir --config-settings=config=Gtk3,Gdk3,GtkSource4
python-gnupg
qrcode
@@ -52,10 +53,10 @@ css_parser
sentry-sdk
emoji
"
-pip3 install --upgrade precis-i18n
-pip3 install --upgrade $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
# Workaround for https://dev.gajim.org/gajim/gajim/-/issues/11490
-SETUPTOOLS_USE_DISTUTILS=stdlib pip3 install --upgrade
git+https://dev.gajim.org/gajim/omemo-dr.git
+# Env variable described in https://www.msys2.org/docs/python/
+SETUPTOOLS_USE_DISTUTILS=stdlib pip3 install --upgrade precis-i18n
+SETUPTOOLS_USE_DISTUTILS=stdlib pip3 install --upgrade $(echo
"$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
}
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/ec582a43da381ebbc1b858c7396cc271c72f8ca6
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/ec582a43da381ebbc1b858c7396cc271c72f8ca6
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
