PR#3: Update to 4.7.1 - rpms/python-beautifulsoup4

rpms / python-beautifulsoup4

#3 Update to 4.7.1

Closed 4 years ago by zbyszek. Opened 4 years ago by zbyszek.

rpms/ zbyszek/python-beautifulsoup4 v4.7.1 into master

Use %{expand} and add missing %{python_provide}

Zbigniew Jędrzejewski-Szmek • 4 years ago

f01a900

Update to 4.7.1

Zbigniew Jędrzejewski-Szmek • 4 years ago

c4f2a90

python-beautifulsoup4.spec

file modified

+30 -25

		`@@ -1,6 +1,6 @@`
		`Name: python-beautifulsoup4`
		`- Version: 4.6.3`
		`- Release: 2%{?dist}`
		`+ Version: 4.7.1`
		`+ Release: 1%{?dist}`
		`Summary: HTML/XML parser for quick-turnaround applications like screen-scraping`
		`License: MIT`
		`URL: http://www.crummy.com/software/BeautifulSoup/`
		`@@ -11,6 +11,7 @@`
		`BuildRequires: python2-html5lib`
		`BuildRequires: python2-setuptools`
		`BuildRequires: python2-lxml`
		`+ BuildRequires: python2-soupsieve`
		`BuildRequires: /usr/bin/2to3`
		`BuildRequires: python2-tools`
		`# html5lib BR just for test coverage`
		`@@ -18,25 +19,26 @@`
		`BuildRequires: python3-devel`
		`BuildRequires: python3-setuptools`
		`BuildRequires: python3-lxml`
		`+ BuildRequires: python3-soupsieve`

		`- %global _description\`
		`- Beautiful Soup is a Python HTML/XML parser designed for quick\`
		`- turnaround projects like screen-scraping. Three features make it\`
		`- powerful:\`
		`- \`
		`- Beautiful Soup wont choke if you give it bad markup.\`
		`- \`
		`- Beautiful Soup provides a few simple methods and Pythonic idioms for\`
		`- navigating, searching, and modifying a parse tree.\`
		`- \`
		`- Beautiful Soup automatically converts incoming documents to Unicode\`
		`- and outgoing documents to UTF-8.\`
		`- \`
		`- Beautiful Soup parses anything you give it.\`
		`- \`
		`- Valuable data that was once locked up in poorly-designed websites is\`
		`- now within your reach. Projects that would have taken hours take only\`
		`- minutes with Beautiful Soup.`
		`+ %global _description %{expand:`
		`+ Beautiful Soup is a Python HTML/XML parser designed for quick`
		`+ turnaround projects like screen-scraping. Three features make it`
		`+ powerful:`
		`+`
		`+ Beautiful Soup won't choke if you give it bad markup.`
		`+`
		`+ Beautiful Soup provides a few simple methods and Pythonic idioms for`
		`+ navigating, searching, and modifying a parse tree.`
		`+`
		`+ Beautiful Soup automatically converts incoming documents to Unicode`
		`+ and outgoing documents to UTF-8.`
		`+`
		`+ Beautiful Soup parses anything you give it.`
		`+`
		`+ Valuable data that was once locked up in poorly-designed websites is`
		`+ now within your reach. Projects that would have taken hours take only`
		`+ minutes with Beautiful Soup.}`

		`%description %_description`

		`@@ -44,19 +46,19 @@`
		`Summary: %summary`
		`Requires: python2-lxml`
		`%{?python_provide:%python_provide python2-beautifulsoup4}`
		`+`
		`%description -n python2-beautifulsoup4 %_description`

		`%package -n python3-beautifulsoup4`
		`Summary: %summary`
		`Requires: python3-lxml`
		`Obsoletes: python3-BeautifulSoup < 1:3.2.1-2`
		`+ %{?python_provide:%python_provide python3-beautifulsoup4}`
		`+`
		`%description -n python3-beautifulsoup4 %_description`

		`%prep`
		`%setup -q -n beautifulsoup4-%{version}`
		`- mv AUTHORS.txt AUTHORS.txt.iso`
		`- iconv -f ISO-8859-1 -t UTF-8 -o AUTHORS.txt AUTHORS.txt.iso`
		`- touch -r AUTHORS.txt.iso AUTHORS.txt`
		`rm -rf %{py3dir} && cp -a . %{py3dir}`

		`%build`
		`@@ -77,17 +79,20 @@`

		`%files -n python2-beautifulsoup4`
		`%license COPYING.txt`
		`- %doc AUTHORS.txt NEWS.txt TODO.txt`
		`+ %doc NEWS.txt TODO.txt`
		`%{python2_sitelib}/beautifulsoup4-%{version}*.egg-info`
		`%{python2_sitelib}/bs4`

		`%files -n python3-beautifulsoup4`
		`%license COPYING.txt`
		`- %doc AUTHORS.txt NEWS.txt TODO.txt`
		`+ %doc NEWS.txt TODO.txt`
		`%{python3_sitelib}/beautifulsoup4-%{version}*.egg-info`
		`%{python3_sitelib}/bs4`

		`%changelog`
		`+ * Mon Jun 10 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.1-1`
		`+ - Update to latest version`
		`+`
		`* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.3-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (beautifulsoup4-4.6.3.tar.gz) = 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23`
		`+ SHA512 (beautifulsoup4-4.7.1.tar.gz) = 7aa77bc6008bbcbbbe91b0a850007ab237d2832b63a787fbd94b7cbf47d4276b185e0c61c134df73221406458edff2b75b6b8c2b53b543aa3bb1b0e2202dac5a`

zbyszek commented 4 years ago

This changeset adds a dependency on python[23]-soupsieve, which is under
review in https://bugzilla.redhat.com/show_bug.cgi?id=1719008.

churchyard commented 4 years ago

try:
    import soupsieve
except ImportError, e:
    soupsieve = None
    warnings.warn(
        'The soupsieve package is not installed. CSS selectors cannot be used.'
    )

Can we get around this? I.e. can we not support CSS selectors on Python 2?

terjeros commented 4 years ago

Use Recommends: python[23]-soupsieve?

zbyszek commented 4 years ago

Updated to use Recommends: python[23]-soupsieve.

rebased onto 1b54e84

4 years ago

churchyard commented 4 years ago

Check the automated requires, they might contain soupsieve.

zbyszek commented 4 years ago

It is listed in requires.txt, but the import is conditional (as you pasted above). So it seems OK to only use Recommends.

churchyard commented 4 years ago

So it is not added by the automatic python dependency generator?

terjeros commented 4 years ago

Might be, I forgot that's implemented now.

rebased onto c4f2a90

4 years ago

zbyszek commented 4 years ago

I forgot too ;) I removed the Recommends again, because they duplicate the automatically generated Requires. If you think the autogenerated Requires should be removed and replaced with Recommends, let me know.

zbyszek commented 4 years ago

Obsolete.

Pull-Request has been closed by zbyszek

4 years ago