Merge pull request #42 from ericfell/issue-38-str-enum

Issue 38: Fix failed test due to CPython str/enum behavior change

.github/workflows/ci.yml

@@ -3,14 +3,18 @@ on: [push, pull_request]
 jobs:
  run:
  runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ python-version: ['3.10', '3.11', '3.12']
+
  steps:
  - name: Checkout
  uses: actions/checkout@v4
 
- - name: Set up Python 3.10
+ - name: Set up Python ${{ matrix.python-version }}
  uses: actions/setup-python@v4
  with:
- python-version: '3.10'
+ python-version: ${{ matrix.python-version }}
 
  - name: Install dependencies
  run: |

src/rfbzero/experiment.py

@@ -638,7 +638,7 @@ def update_concentrations(i: float) -> tuple[dict[str, float], dict[str, float]]
  @staticmethod
  def _end_protocol(results: CyclingResults, end_status: CyclingStatus) -> CyclingResults:
  """Records the status that ended the simulation and logs the time."""
- print(f'Simulation stopped after {results.steps} time steps: {end_status}.')
+ print(f'Simulation stopped after {results.steps} time steps: {end_status.value}.')
  results.end_status = end_status
  results._finalize()
  return results
@@ -738,7 +738,7 @@ def get_cycle_mode(charge: bool) -> _ConstantCurrentCycleMode:
  raise ValueError(cycling_status)
 
  cycle_name = 'charge' if self.charge_first else 'discharge'
- print(f'Skipping to {cycle_name} cycle: {cycling_status}')
+ print(f'Skipping to {cycle_name} cycle: {cycling_status.value}')
  cycling_status = CyclingStatus.NORMAL
 
  while cycling_status == CyclingStatus.NORMAL:
@@ -983,7 +983,7 @@ def get_cv_cycle_mode(
  cycling_status = cycle_mode.validate()
  is_cc_mode = cycling_status == CyclingStatus.NORMAL
  if not is_cc_mode:
- print(f'Skipping to CV cycling: {cycling_status}')
+ print(f'Skipping to CV cycling: {cycling_status.value}')
  cv_current = self.current_charge if self.charge_first else self.current_discharge
  cycle_mode = get_cv_cycle_mode(self.charge_first, cv_current)
  cycling_status = cycle_mode.validate()