From 7bc7dabc7015bcd0020b07c7634d8bb7e780351a Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Mon, 14 Aug 2023 22:01:57 +0100
Subject: [PATCH 1/4] Update CircleCI docker images to the recommended
 replacements

See https://discuss.circleci.com/t/legacy-convenience-image-deprecation/41034
---
 .circleci/config.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2af1e62f..055d20bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,7 @@ jobs:
           path: test-reports
 
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
 
   # symengine does not seem to install correctly with Python 3.8 yet
   "python-3.7-symengine":
@@ -73,14 +73,14 @@ jobs:
       PIP_EXTRA_INSTALLATION: numpy symengine==0.5.0
       USE_SYMENGINE: 1
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
   # sympy 1.4 does not claim to support Python 3.8
   "python-3.7-sympy-1.4":
     <<: *defaults
     environment:
       PIP_EXTRA_INSTALLATION: sympy==1.4
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
 
   "python-3.8-sympy-master":
     <<: *defaults
@@ -88,29 +88,29 @@ jobs:
       # use the archive url to prevent full git clone
       PIP_EXTRA_INSTALLATION: https://github.com/sympy/sympy/archive/master.zip
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
 
   # make sure to keep setup.py in sync with these
   "python-3.9":
     <<: *defaults
     docker:
-      - image: circleci/python:3.9
+      - image: cimg/python:3.9
   "python-3.8":
     <<: *defaults
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
   "python-3.7":
     <<: *defaults
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
   "python-3.6":
     <<: *defaults
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.6
 
   "publish":
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
     steps:
       - checkout
       - run:

From 73eefe6c4f17d420357501c959a7382bf0e8e8e0 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Mon, 14 Aug 2023 22:14:04 +0100
Subject: [PATCH 2/4] Remove `sudo` from circleCI config

`pip` is now only on the user path, not the system path
---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 055d20bd..f1260b4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,13 +7,13 @@ defaults: &defaults
     - run:
         name: Install
         command: |
-          sudo pip install -r test_requirements.txt
-          sudo pip install -e .
+          pip install -r test_requirements.txt
+          pip install -e .
           if [ -n "$PIP_EXTRA_INSTALLATION" ]; then
             # deliberately not quoted
-            sudo pip install $PIP_EXTRA_INSTALLATION
+            pip install $PIP_EXTRA_INSTALLATION
           fi
-          sudo pip check
+          pip check
     - run:
         name: Test
         command: |
@@ -40,7 +40,7 @@ defaults: &defaults
         name: Coverage
         when: on_success
         command: |
-          sudo pip install codecov
+          pip install codecov
           codecov
     - store_test_results:
         path: test-reports
@@ -54,7 +54,7 @@ jobs:
       - run:
           name: Install
           command: |
-            sudo pip install flake8 flake8_formatter_junit_xml
+            pip install flake8 flake8_formatter_junit_xml
       - run:
           name: Lint
           command: |

From ab380b018444d7784e87f2d8ae5e5be26a1b187c Mon Sep 17 00:00:00 2001
From: Mike Boyle <michael.oliver.boyle@gmail.com>
Date: Mon, 14 Aug 2023 22:24:17 +0100
Subject: [PATCH 3/4] Fix flake8 error

---
 galgebra/mv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/galgebra/mv.py b/galgebra/mv.py
index cc08db5c..ecec5dc3 100644
--- a/galgebra/mv.py
+++ b/galgebra/mv.py
@@ -1252,7 +1252,7 @@ def inv(self) -> 'Mv':
             return (S.One/self_sq.obj)*self
         self_rev = self.rev()
         self_self_rev = self * self_rev
-        if(self_self_rev.is_scalar()):  # self*self.rev() is a scalar
+        if self_self_rev.is_scalar():  # self*self.rev() is a scalar
             """
             if self_self_rev.scalar() == S.Zero:
                 raise ValueError('!!!!In multivector inverse A*A.rev() is zero!!!!')

From 43ec56041643cea92a12e6ceed950af2c976ca25 Mon Sep 17 00:00:00 2001
From: Mike Boyle <michael.oliver.boyle@gmail.com>
Date: Mon, 14 Aug 2023 22:28:33 +0100
Subject: [PATCH 4/4] Fix invalid python_requires specifier in setup.py

See https://reviews.llvm.org/rLNT0476dede37838e2f765f50dd26734cfced9d90d9, this syntax was never supposed to be valid.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f80b7f9c..1116da22 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
     package_dir={'galgebra': 'galgebra'},
     # Sympy 1.4 is needed for printing tests to pass, but 1.3 will still work
     install_requires=['sympy'],
-    python_requires='>=3.6.*',
+    python_requires='>=3.6',
     long_description=long_description,
     long_description_content_type='text/markdown',
     classifiers=[