The package rpms/hatch.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/hatch.git/commit/?id=6743bfc222ac672....
Change: -%ifnarch x86_64
Thanks.
Full change: ============
commit 6743bfc222ac6723412244f9735e42408d424f12 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Mon Dec 25 15:22:04 2023 -0500
Update to 1.9.1 (close RHBZ#2255798)
diff --git a/.gitignore b/.gitignore index 2927f19..f39c3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /hatch-hatch-v1.8.0.tar.gz /hatch-hatch-v1.8.1.tar.gz /hatch-hatch-v1.9.0.tar.gz +/hatch-hatch-v1.9.1.tar.gz diff --git a/1167.patch b/1167.patch deleted file mode 100644 index 75a5ccd..0000000 --- a/1167.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f0b6ce2647bf3323a2dff6254020df379cb8ea43 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" code@musicinmybrain.net -Date: Tue, 19 Dec 2023 17:32:37 -0500 -Subject: [PATCH] Add the requires_internet mark to a few tests - -Three of the four test_no_compatibility_check_if_exists tests fail, and -the captured stderr contains a network-related error, in an offline -build for Fedora Linux. This adds the requires_internet mark to those -tests. ---- - tests/cli/build/test_build.py | 1 + - tests/cli/project/test_metadata.py | 1 + - tests/cli/version/test_version.py | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/tests/cli/build/test_build.py b/tests/cli/build/test_build.py -index 47d69cb5..8c310ddc 100644 ---- a/tests/cli/build/test_build.py -+++ b/tests/cli/build/test_build.py -@@ -145,6 +145,7 @@ def test_incompatible_environment(hatch, temp_dir, helpers): - - - @pytest.mark.allow_backend_process -+@pytest.mark.requires_internet - def test_no_compatibility_check_if_exists(hatch, temp_dir, helpers, mocker): - project_name = 'My.App' - -diff --git a/tests/cli/project/test_metadata.py b/tests/cli/project/test_metadata.py -index 107753a0..ebc992d3 100644 ---- a/tests/cli/project/test_metadata.py -+++ b/tests/cli/project/test_metadata.py -@@ -382,6 +382,7 @@ def test_plugin_dependencies_unmet(self, hatch, temp_dir, helpers, mock_plugin_i - helpers.assert_plugin_installation(mock_plugin_installation, [dependency]) - - @pytest.mark.allow_backend_process -+ @pytest.mark.requires_internet - def test_no_compatibility_check_if_exists(self, hatch, temp_dir, helpers, mocker): - project_name = 'My.App' - -diff --git a/tests/cli/version/test_version.py b/tests/cli/version/test_version.py -index 660debed..7af10f77 100644 ---- a/tests/cli/version/test_version.py -+++ b/tests/cli/version/test_version.py -@@ -158,6 +158,7 @@ def test_plugin_dependencies_unmet(hatch, helpers, temp_dir, mock_plugin_install - helpers.assert_plugin_installation(mock_plugin_installation, [dependency]) - - -+@pytest.mark.requires_internet - def test_no_compatibility_check_if_exists(hatch, helpers, temp_dir, mocker): - project_name = 'My.App' - diff --git a/1177.patch b/1177.patch new file mode 100644 index 0000000..cc6ede0 --- /dev/null +++ b/1177.patch @@ -0,0 +1,31 @@ +From 24f951ea8d857e8865a5f60744e728a062273e21 Mon Sep 17 00:00:00 2001 +From: Ofek Lev ofekmeister@gmail.com +Date: Mon, 25 Dec 2023 11:11:34 -0500 +Subject: [PATCH] Fix test that fails for openSUSE and other re-distributors + +--- + tests/python/test_resolve.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/python/test_resolve.py b/tests/python/test_resolve.py +index 9a7d11e8..396271b6 100644 +--- a/tests/python/test_resolve.py ++++ b/tests/python/test_resolve.py +@@ -1,4 +1,5 @@ + import sys ++from platform import machine + + import pytest + +@@ -12,7 +13,10 @@ def test_unknown_distribution(self): + with pytest.raises(PythonDistributionUnknownError, match='Unknown distribution: foo'): + get_distribution('foo') + +- @pytest.mark.skipif(sys.platform == 'darwin', reason='No variants for macOS') ++ @pytest.mark.skipif( ++ not (sys.platform == 'win32' or (sys.platform != 'darwin' and machine().lower() == 'x86_64')), ++ reason='No variants for this platform and architecture combination', ++ ) + def test_resolution_error(self, platform): + with EnvVars({f'HATCH_PYTHON_VARIANT_{platform.name.upper()}': 'foo'}), pytest.raises( + PythonDistributionResolutionError, diff --git a/hatch.spec b/hatch.spec index c66d006..2f9bcba 100644 --- a/hatch.spec +++ b/hatch.spec @@ -5,7 +5,7 @@ #global snapdate yyyymmdd
Name: hatch -Version: 1.9.0%{?commit:^%{snapdate}git%(c='%{commit}'; echo "${c:0:7}")} +Version: 1.9.1%{?commit:^%{snapdate}git%(c='%{commit}'; echo "${c:0:7}")} Release: %autorelease Summary: A modern project, package, and virtual env manager
@@ -65,9 +65,9 @@ Source1550: hatch-python-update.1 # Downstream-only; upstream tests with the latest rich, and the differences are # not semantically meaningful. Patch: 0001-Adjust-expected-output-for-older-rich-13.5.2.patch -# Add the requires_internet mark to a few tests -# https://github.com/pypa/hatch/pull/1167 -Patch: %{url}/pull/1167.patch +# Fix test that fails for openSUSE and other re-distributors +# https://github.com/pypa/hatch/pull/1177 +Patch: %{url}/pull/1177.patch
BuildArch: noarch
@@ -160,14 +160,6 @@ k="${k-}${k+ and }not (TestBuildStandard and test_default_auto_detection)" k="${k-}${k+ and }not test_explicit_path" k="${k-}${k+ and }not test_default"
-%ifnarch x86_64 -# Several tests related to Python distributions fail on Fedora Linux on -# non-x86_64 architectures -# https://github.com/pypa/hatch/issues/1145 -k="${k-}${k+ and }not (TestGetInstalled and test_order)" -k="${k-}${k+ and }not test_variants[linux-" -%endif - %pytest -k "${k-}" -vv %else %pyproject_check_import diff --git a/sources b/sources index 5b9ca61..2011019 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hatch-hatch-v1.9.0.tar.gz) = 61c66a4bf6d011b2acf489c244676210da4d91bdbedee723ce8aa2ce83e63a3ddee84b24f67d7656de8b73609e6307e759ada9f279fe01040a65e9a8e0eee18f +SHA512 (hatch-hatch-v1.9.1.tar.gz) = 65eeafdbd5655e9f672e7be21e1a242abaaf4b866a308b315e762f2f9ee3a08f020639e133a7847ba8988ccdabb93d0e2b75ebda277ad2a5bcd0bd8c7da696c3