[SQL-CVS] SQLObject development repository branch master updated. 3.10.2-2-g0d633b7

[phd <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  0d633b72642bace7da86a51470aca1044b82c808 (commit)
      from  00ed0745fd94cf2a030083cc6d09c97a9fc5be22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/0d633b72642bace7da86a51470aca1044b82c808

commit 0d633b72642bace7da86a51470aca1044b82c808
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Sep 17 19:32:32 2023 +0300

    CI(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.

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 60b4188..392147f 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -59,7 +59,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 >= 3.15, < 4"
diff --git a/docs/News.rst b/docs/News.rst
index 2d05200..f37f366 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,14 @@ News
 SQLObject (master)
 ==================
 
+CI
+--
+
+* 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.
+
 SQLObject 3.10.2
 ================
 

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/run-tests.yaml | 2 +-
 docs/News.rst                    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
SQLObject development repository