From 18bfa9a29fb785b36f931c445a0eaeefda5c3baf Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Wed, 30 Nov 2022 20:42:12 -0500 Subject: [PATCH] fix: Import backports-datetime-fromisoformat only if needed, to fix PyPy 3.7 support --- .github/workflows/test.yml | 2 +- CHANGELOG.md | 4 ++++ flattentool/ODSReader.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a5d0553..43d6da2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.7'] jsonref-version: ["==0.3", ">1"] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3baa5c5..daacc06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixed + +- Import backports-datetime-fromisoformat only if needed, to fix PyPy 3.7 support + ## [0.19.0] - 2022-11-16 ### Fixed diff --git a/flattentool/ODSReader.py b/flattentool/ODSReader.py index f4ec404..1eddb9d 100644 --- a/flattentool/ODSReader.py +++ b/flattentool/ODSReader.py @@ -18,7 +18,6 @@ from collections import OrderedDict from datetime import datetime -import backports.datetime_fromisoformat import odf.opendocument from odf.table import Table, TableCell, TableRow @@ -26,6 +25,8 @@ try: _ = datetime.fromisoformat except AttributeError: + import backports.datetime_fromisoformat + backports.datetime_fromisoformat.MonkeyPatch.patch_fromisoformat()