From 91df0613fbf1e07d4109bd16c5cfc6e3c3da2c50 Mon Sep 17 00:00:00 2001 From: Davide Brunato Date: Thu, 12 Sep 2024 12:56:36 +0200 Subject: [PATCH] Bump hotfix release - Fix other failing URL normalization tests --- CHANGELOG.rst | 5 +++++ doc/conf.py | 2 +- publiccode.yml | 2 +- setup.py | 2 +- tests/test_locations.py | 5 ++--- xmlschema/__init__.py | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ded19943..a40a2751 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,10 @@ CHANGELOG ********* +`v3.4.2`_ (2024-09-12) +====================== +* Fix other failing URL normalization tests + `v3.4.1`_ (2024-09-12) ====================== * Fix failing URL normalization tests (issue #416) @@ -721,3 +725,4 @@ v0.9.6 (2017-05-05) .. _v3.3.2: https://github.com/brunato/xmlschema/compare/v3.3.1...v3.3.2 .. _v3.4.0: https://github.com/brunato/xmlschema/compare/v3.3.2...v3.4.0 .. _v3.4.1: https://github.com/brunato/xmlschema/compare/v3.4.0...v3.4.1 +.. _v3.4.2: https://github.com/brunato/xmlschema/compare/v3.4.1...v3.4.2 diff --git a/doc/conf.py b/doc/conf.py index b5d7d345..4382be36 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -81,7 +81,7 @@ # The short X.Y version. version = '3.4' # The full version, including alpha/beta/rc tags. -release = '3.4.1' +release = '3.4.2' # 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 134821bb..cc0fb03b 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -7,7 +7,7 @@ name: xmlschema url: 'https://github.com/sissaschool/xmlschema' landingURL: 'https://github.com/sissaschool/xmlschema' releaseDate: '2024-09-12' -softwareVersion: v3.4.1 +softwareVersion: v3.4.2 developmentStatus: stable platforms: - linux diff --git a/setup.py b/setup.py index 477a4789..ea0ada66 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='xmlschema', - version='3.4.1', + version='3.4.2', packages=find_packages(include=['xmlschema*']), package_data={ 'xmlschema': ['py.typed', 'locale/**/*.mo', 'locale/**/*.po', 'schemas/*/*.xsd'], diff --git a/tests/test_locations.py b/tests/test_locations.py index 53452ddb..ceb02f9b 100644 --- a/tests/test_locations.py +++ b/tests/test_locations.py @@ -12,7 +12,6 @@ import os import pathlib import platform -import sys from urllib.parse import urlsplit, uses_relative from pathlib import Path, PurePath, PureWindowsPath, PurePosixPath @@ -293,7 +292,7 @@ def test_normalize_url_with_base_unc_path(self,): self.assertEqual(url, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd') url = normalize_url(r'dev\XMLSCHEMA\test.xsd', base_url=base_url_host_in_path) - if sys.version_info < (3, 12, 4): + if not has_fix_for_issue_67673(): self.assertEqual(url, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd') else: self.assertEqual(url, 'file://////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd') @@ -310,7 +309,7 @@ def test_normalize_url_with_base_unc_path(self,): self.assertEqual(url, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd') url = normalize_url(r'dev/XMLSCHEMA/test.xsd', base_url=base_url_host_in_path) - if sys.version_info < (3, 12, 4): + if not has_fix_for_issue_67673(): self.assertEqual(url, 'file:////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd') else: self.assertEqual(url, 'file://////filer01/MY_HOME/dev/XMLSCHEMA/test.xsd') diff --git a/xmlschema/__init__.py b/xmlschema/__init__.py index 46d6da03..506ad980 100644 --- a/xmlschema/__init__.py +++ b/xmlschema/__init__.py @@ -33,7 +33,7 @@ XMLSchema, XMLSchema10, XMLSchema11, XsdComponent, XsdType, XsdElement, XsdAttribute ) -__version__ = '3.4.1' +__version__ = '3.4.2' __author__ = "Davide Brunato" __contact__ = "brunato@sissa.it" __copyright__ = "Copyright 2016-2024, SISSA"