CI(pip): Ensure `pip` only if needed

This is to work around a problem in conda with Python 3.7 -
it brings in wrong version of `setuptools` incompatible with Python 3.7.

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 254ab171d5dab6bfa447fe52836fb1ec83c2117c..8b35f6461ba8bdec4ca95e7ca05c028c3b99e296 100644 (file)
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           python --version
-          python -m ensurepip
+          python -m pip || python -m ensurepip --default-pip --upgrade
           python -m pip install --upgrade pip setuptools wheel
           pip --version
           pip install --upgrade virtualenv "tox >= 2.0, < 4"

diff --git a/ANNOUNCE b/ANNOUNCE
index 7d6d59ce56109b83635e53a6a0e8a0b488dbfb18..bf06ef9cb7ed5248071abd17e03607c62853b0c2 100644 (file)
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -30,6 +30,13 @@ everything else. This is how it could be done:
    mimedecode -t application/pdf -t application/postscript -t text/plain -b text/html -B 'image/*' -i '*/*'
 
 
+Version 3.1.0.post6 (2023-09-17)
+
+    GHActions: Ensure `pip` only if needed
+
+    This is to work around a problem in conda with Python 3.7 -
+    it brings in wrong version of `setuptools` incompatible with Python 3.7.
+
 Version 3.1.0.post5 (2023-07-07)
 
    Install all Python and PyPy versions from ``conda-forge``.

diff --git a/mimedecode/__version__.py b/mimedecode/__version__.py
index ba1fe4604b09d84292dc468418708b53e2488a92..78160ca07ccf00c384567fe5f4b1c938f7d93af5 100644 (file)
--- a/mimedecode/__version__.py
+++ b/mimedecode/__version__.py
@@ -1,4 +1,4 @@
-__version__ = "3.1.0.post5"
+__version__ = "3.1.0.post6"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2001-2023 PhiloSoft Design"
 __license__ = "GNU GPL"