From a3515d0fa3857c849d8cda7c93e051e05b5a7e46 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 1/2] fix: Import backports-datetime-fromisoformat only if needed, to fix PyPy 3.7 support https://github.com/OpenDataServices/flatten-tool/pull/415 --- CHANGELOG.md | 4 ++++ flattentool/ODSReader.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8c0d95..d08c69a 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.20.0] - 2022-12-07 ### Changed 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() From 8a91567b620cbd382cc43c6cd862c1c1af092ba4 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 11 Jan 2023 14:42:52 +0000 Subject: [PATCH 2/2] release: 0.20.1 --- CHANGELOG.md | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d08c69a..9e0a79d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.20.1] - 2023-01-11 + ### Fixed - Import backports-datetime-fromisoformat only if needed, to fix PyPy 3.7 support diff --git a/setup.py b/setup.py index f819680..8d60ff5 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def run(self): setup( name="flattentool", - version="0.20.0", + version="0.20.1", author="Open Data Services", author_email="code@opendataservices.coop", packages=["flattentool"],