public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-twine] rawhide: Fix F45FTBFS + spec cleanup and modernization
@ 2026-08-15 20:05 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-08-15 20:05 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python-twine
            Branch : rawhide
            Commit : b2452acaaa6624452706e9e5f9066fb49ffcb05b
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-06T16:22:49-03:00
            Stats  : +16/-35 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-twine/c/b2452acaaa6624452706e9e5f9066fb49ffcb05b?branch=rawhide

            Log:
            Fix F45FTBFS + spec cleanup and modernization

Resolves: rhbz#2504591 - python-twine: FTBFS in Fedora rawhide/f45

---
diff --git a/.gitignore b/.gitignore
index f23cc4f..0ed5e14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1 @@
-/twine-1.7.4.tar.gz
-/twine-1.8.1.tar.gz
-/twine-1.9.1.tar.gz
-/twine-1.10.0.tar.gz
-/twine-1.12.2.tar.gz
-/twine.1
-/twine-1.15.0.tar.gz
-/twine-3.1.1.tar.gz
-/twine-3.2.0.tar.gz
-/twine-3.3.0.tar.gz
-/twine-3.4.1.tar.gz
-/twine-3.4.2.tar.gz
-/twine-3.6.0.tar.gz
-/twine-3.7.0.tar.gz
-/twine-3.7.1.tar.gz
-/twine-3.8.0.tar.gz
-/twine-4.0.0.tar.gz
-/twine-4.0.1.tar.gz
-/twine-4.0.2.tar.gz
-/twine-5.0.0.tar.gz
-/twine-5.1.1.tar.gz
-/twine-6.0.1.tar.gz
-/twine-6.1.0.tar.gz
-/twine-6.2.0.tar.gz
+/twine-*.tar.gz

diff --git a/python-twine.spec b/python-twine.spec
index 0c4095f..b705d4f 100644
--- a/python-twine.spec
+++ b/python-twine.spec
@@ -15,15 +15,8 @@ Source0:        %{pypi_source}
 
 BuildArch:      noarch
 
-%description
-Twine is a utility for interacting with PyPI.
-Currently it only supports registering projects and uploading distributions.
-
-%package -n %{srcname}
-Summary:        Twine is a utility for publishing Python packages on PyPI
-
-BuildRequires:  python3-devel
 BuildRequires:  pyproject-rpm-macros
+BuildRequires:  python3-devel
 
 %if %{with tests}
 # Test dependencies
@@ -41,12 +34,12 @@ BuildRequires:  python3dist(sphinxcontrib-programoutput)
 %endif
 # with docs
 %if %{with internet}
+BuildRequires:  gcc
+BuildRequires:  git-core
+BuildRequires:  libffi-devel
 # pytest-services and pytest-socket are not packaged yet
 #BuildRequires:  python3dist(pytest-services)
 #BuildRequires:  python3dist(pytest-socket)
-BuildRequires:  gcc
-BuildRequires:  libffi-devel
-BuildRequires:  git-core
 %endif
 # with internet
 
@@ -56,6 +49,13 @@ BuildRequires:  git-core
 Obsoletes:      python2-%{srcname} < 1.12.2-3
 Obsoletes:      python3-%{srcname} < 1.12.2-3
 
+%description
+Twine is a utility for interacting with PyPI.
+Currently it only supports registering projects and uploading distributions.
+
+%package -n %{srcname}
+Summary:        Twine is a utility for publishing Python packages on PyPI
+
 %description -n %{srcname}
 Twine is a utility for interacting with PyPI.
 Currently it only supports registering projects and uploading distributions.
@@ -63,6 +63,9 @@ Currently it only supports registering projects and uploading distributions.
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
 
+# Remove shebang from non-executable script
+sed -i '1{\@^#!/usr/bin/env python@d}' twine/__main__.py
+
 %generate_buildrequires
 %pyproject_buildrequires -r
 
@@ -87,6 +90,7 @@ install -p -D -T -m 0644 docs/build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1
 %if %{with tests}
 %check
 %pytest -v \
+      --deselect tests/test_check.py::test_fails_rst_syntax_error \
 %if %{without internet}
       --deselect tests/test_integration.py \
       --deselect tests/test_upload.py::test_check_status_code_for_wrong_repo_url \

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-15 20:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-15 20:05 [rpms/python-twine] rawhide: Fix F45FTBFS + spec cleanup and modernization Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox