diff --git a/.github/workflows/build_flake_pytest_ubuntu2004.yml b/.github/workflows/build_flake_pytest_ubuntu2004.yml index b762e56c..e80c3e8c 100644 --- a/.github/workflows/build_flake_pytest_ubuntu2004.yml +++ b/.github/workflows/build_flake_pytest_ubuntu2004.yml @@ -15,8 +15,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["2.7", "3.8", "3.11", "3.x"] - + python-version: ["2.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/ImageD11/stress.py b/ImageD11/stress.py index 2f6d333f..809a1801 100644 --- a/ImageD11/stress.py +++ b/ImageD11/stress.py @@ -88,8 +88,8 @@ def __init__(self, def __str__(self): - return f"EpsSigSolver:\n phase name: {self.phase_name}\n reference unitcell: {self.unitcell}\n symmetry:" +\ - f"{self.symmetry}\n unit:{self.stress_unit}\n Stiffness:\n {self.Cij}\n n ubis: {len(self.UBIs)}" + return ("EpsSigSolver:\n phase name: {phase_name}\n reference unitcell: {unitcell}\n symmetry:" +\ + "{symmetry}\n unit:{stress_unit}\n Stiffness:\n {Cij}\n n ubis: {nUBIs)}").format(self) # Load / save / update functions for parameters (from former eps_sig_solver.py) ######################################## diff --git a/README.md b/README.md index 708a73a7..54236587 100644 --- a/README.md +++ b/README.md @@ -59,9 +59,14 @@ Good luck! ## CI Status +[![Flake, Build and PyTest](https://github.com/FABLE-3DXRD/ImageD11/actions/workflows/build_flake_pytest_ubuntu2004.yml/badge.svg)](https://github.com/FABLE-3DXRD/ImageD11/actions/workflows/build_flake_pytest_ubuntu2004.yml) + + diff --git a/setup.py b/setup.py index 7d996203..9fc9baf3 100644 --- a/setup.py +++ b/setup.py @@ -202,6 +202,7 @@ def build_extension(self, ext): cmdclass={ 'build_ext' : build_ext_subclass }, description='ImageD11', license = "GPL", + python_requires='<3.12', # Numba still not working for 3.12 ext_package = "ImageD11", # Puts extensions in the ImageD11 directory ext_modules = [extension,], setup_requires = minimal, # to compile