From 0a28b83b276efa3b049a01bec60474c2c002c1e3 Mon Sep 17 00:00:00 2001 From: Davide Brunato Date: Sun, 7 Apr 2024 17:48:41 +0200 Subject: [PATCH] Bump bugfix release - Fix import of Counter for static typing with Python 3.8 --- CHANGELOG.rst | 7 +++++++ doc/conf.py | 2 +- publiccode.yml | 4 ++-- setup.py | 2 +- xmlschema/__init__.py | 2 +- xmlschema/aliases.py | 3 +-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bae0dc33..382b1c0b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,12 @@ CHANGELOG ********* +`v3.2.1`_ (2024-04-07) +====================== +* Improve ModelVisitor and particle occurs checking +* Fix interleave mode with XSD 1.1 open content (issue #397) +* Fix for export/download of XSD sources with commented-out imports/include (issue #387) + `v3.2.0`_ (2024-03-25) ====================== * Add *download_schemas()* to package API (#387) @@ -685,3 +691,4 @@ v0.9.6 (2017-05-05) .. _v3.0.2: https://github.com/brunato/xmlschema/compare/v3.0.1...v3.0.2 .. _v3.1.0: https://github.com/brunato/xmlschema/compare/v3.0.2...v3.1.0 .. _v3.2.0: https://github.com/brunato/xmlschema/compare/v3.1.0...v3.2.0 +.. _v3.2.1: https://github.com/brunato/xmlschema/compare/v3.2.0...v3.2.1 diff --git a/doc/conf.py b/doc/conf.py index a904cf53..d775efdd 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -81,7 +81,7 @@ # The short X.Y version. version = '3.2' # The full version, including alpha/beta/rc tags. -release = '3.2.0' +release = '3.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/publiccode.yml b/publiccode.yml index a2c4d38a..ca1b3e5e 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -6,8 +6,8 @@ publiccodeYmlVersion: '0.2' name: xmlschema url: 'https://github.com/sissaschool/xmlschema' landingURL: 'https://github.com/sissaschool/xmlschema' -releaseDate: '2024-03-25' -softwareVersion: v3.2.0 +releaseDate: '2024-04-07' +softwareVersion: v3.2.1 developmentStatus: stable platforms: - linux diff --git a/setup.py b/setup.py index eef900e3..d437c82d 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='xmlschema', - version='3.2.0', + version='3.2.1', packages=find_packages(include=['xmlschema*']), package_data={ 'xmlschema': ['py.typed', 'locale/**/*.mo', 'locale/**/*.po', 'schemas/*/*.xsd'], diff --git a/xmlschema/__init__.py b/xmlschema/__init__.py index d22a9ed4..b6b76489 100644 --- a/xmlschema/__init__.py +++ b/xmlschema/__init__.py @@ -33,7 +33,7 @@ XMLSchema, XMLSchema10, XMLSchema11, XsdComponent, XsdType, XsdElement, XsdAttribute ) -__version__ = '3.2.0' +__version__ = '3.2.1' __author__ = "Davide Brunato" __contact__ = "brunato@sissa.it" __copyright__ = "Copyright 2016-2024, SISSA" diff --git a/xmlschema/aliases.py b/xmlschema/aliases.py index 53cb45a5..f121a46a 100644 --- a/xmlschema/aliases.py +++ b/xmlschema/aliases.py @@ -27,10 +27,9 @@ 'ElementHookType', 'UriMapperType', 'OccursCounterType'] if TYPE_CHECKING: - from collections import Counter from decimal import Decimal from pathlib import Path - from typing import Any, Callable, Dict, List, IO, Iterator, \ + from typing import Any, Callable, Counter, Dict, List, IO, Iterator, \ MutableMapping, Tuple, Type, Union from xml.etree import ElementTree