Skip to content

Commit

Permalink
Merge pull request #488 from pygae/fix-circle-ci-images
Browse files Browse the repository at this point in the history
The CircleCI configuration has rotted over time. This gets it functioning again, if only so that we have something to compare against the proposed switch to github actions.
  • Loading branch information
eric-wieser authored Aug 14, 2023
2 parents 0c437d1 + 43ec560 commit 359b0e1
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
30 changes: 15 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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: |
Expand All @@ -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":
Expand All @@ -73,44 +73,44 @@ 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
environment:
# 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:
Expand Down
2 changes: 1 addition & 1 deletion galgebra/mv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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!!!!')
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down

0 comments on commit 359b0e1

Please sign in to comment.