| |
@@ -1,76 +1,72 @@
|
| |
- # Created by pyp2rpm-3.2.2
|
| |
- %global pypi_name black
|
| |
-
|
| |
+ %global pypi_name black
|
| |
+ %global base_version 19.10
|
| |
+ %global prerel b0
|
| |
+ %global upstream_version %{base_version}%{?prerel}
|
| |
Name: python-%{pypi_name}
|
| |
- Version: 19.3b0
|
| |
- Release: 3%{?dist}
|
| |
+ Version: %{base_version}%{?prerel:~%{prerel}}
|
| |
+ Release: 1%{?dist}
|
| |
Summary: The uncompromising code formatter
|
| |
-
|
| |
License: MIT
|
| |
- URL: https://github.com/ambv/black
|
| |
- Source0: https://files.pythonhosted.org/packages/source/b/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
|
| |
+ URL: https://github.com/psf/black
|
| |
+ Source0: %{pypi_source %{pypi_name} %{upstream_version}}
|
| |
Source1: black.1
|
| |
Source2: blackd.1
|
| |
BuildArch: noarch
|
| |
-
|
| |
- BuildRequires: python3-devel
|
| |
- BuildRequires: python3-setuptools
|
| |
- BuildRequires: python3-aiohttp
|
| |
- BuildRequires: python3-appdirs
|
| |
- BuildRequires: python3-attrs >= 17.4.0
|
| |
- BuildRequires: python3-click >= 6.5
|
| |
- BuildRequires: python3-toml >= 0.9.4
|
| |
|
| |
+ BuildRequires: pyproject-rpm-macros
|
| |
|
| |
- %description
|
| |
+ %global _description %{expand:
|
| |
Black is the uncompromising Python code formatter. By using it, you agree to
|
| |
cease control over minutiae of hand-formatting. In return, Black gives you
|
| |
speed, determinism, and freedom from pycodestyle nagging about formatting.
|
| |
- You will save time and mental energy for more important matters.
|
| |
+ You will save time and mental energy for more important matters.}
|
| |
+
|
| |
+ %description %_description
|
| |
+
|
| |
|
| |
%package -n %{pypi_name}
|
| |
Summary: %{summary}
|
| |
|
| |
- Requires: python3-aiohttp
|
| |
- Requires: python3-appdirs
|
| |
- Requires: python3-attrs >= 17.4.0
|
| |
- Requires: python3-click >= 6.5
|
| |
- Requires: python3-setuptools
|
| |
- Requires: python3-toml >= 0.9.4
|
| |
+ # extras_require "d"
|
| |
+ Recommends: python3-aiohttp >= 3.3.2
|
| |
+ Recommends: python3-aiohttp-cors
|
| |
|
| |
# Package was renamed when Fedora 31 was rawhide
|
| |
# Don't remove this before Fedora 33
|
| |
Provides: python3-%{pypi_name} = %{version}-%{release}
|
| |
- Obsoletes: python3-%{pypi_name} < 19.3b0-2
|
| |
+ Obsoletes: python3-%{pypi_name} < 19.4
|
| |
|
| |
- %description -n %{pypi_name}
|
| |
- Black is the uncompromising Python code formatter. By using it, you agree to
|
| |
- cease control over minutiae of hand-formatting. In return, Black gives you
|
| |
- speed, determinism, and freedom from pycodestyle nagging about formatting.
|
| |
- You will save time and mental energy for more important matters.
|
| |
+ %description -n %{pypi_name} %_description
|
| |
|
| |
|
| |
%prep
|
| |
- %autosetup -n %{pypi_name}-%{version}
|
| |
- # Remove bundled egg-info
|
| |
- rm -rf %{pypi_name}.egg-info
|
| |
+ %autosetup -n %{pypi_name}-%{upstream_version}
|
| |
+
|
| |
+ %generate_buildrequires
|
| |
+ # d is a name of extras_require
|
| |
+ %pyproject_buildrequires -rx d
|
| |
+
|
| |
|
| |
%build
|
| |
- %py3_build
|
| |
+ %pyproject_wheel
|
| |
+
|
| |
|
| |
%install
|
| |
- %py3_install
|
| |
- cp %{buildroot}/%{_bindir}/black %{buildroot}/%{_bindir}/black-%{python3_version}
|
| |
- cp %{buildroot}/%{_bindir}/blackd %{buildroot}/%{_bindir}/blackd-%{python3_version}
|
| |
- # ln -s {_bindir}/black-{python3_version} {buildroot}/{_bindir}/black-3
|
| |
+ %pyproject_install
|
| |
+
|
| |
+ ln -s ./black %{buildroot}%{_bindir}/black-%{python3_version}
|
| |
+ ln -s ./blackd %{buildroot}%{_bindir}/blackd-%{python3_version}
|
| |
+ # ln -s ./black-{python3_version} {buildroot}{_bindir}/black-3
|
| |
|
| |
install -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/black.1
|
| |
install -D -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/blackd.1
|
| |
|
| |
+
|
| |
%check
|
| |
export PIP_INDEX_URL=http://host.invalid./
|
| |
export PIP_NO_DEPS=yes
|
| |
- %{__python3} setup.py test
|
| |
+ %{python3} setup.py test
|
| |
+
|
| |
|
| |
%files -n %{pypi_name}
|
| |
%license LICENSE
|
| |
@@ -83,11 +79,23 @@
|
| |
%{_mandir}/man1/blackd.1*
|
| |
|
| |
%{python3_sitelib}/__pycache__/black*
|
| |
+ %{python3_sitelib}/__pycache__/_black*
|
| |
%{python3_sitelib}/black*.py
|
| |
- %{python3_sitelib}/blib2to3
|
| |
- %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
+ %{python3_sitelib}/_black*.py
|
| |
+ %{python3_sitelib}/blib2to3/
|
| |
+ %{python3_sitelib}/%{pypi_name}-%{upstream_version}.dist-info/
|
| |
+
|
| |
|
| |
%changelog
|
| |
+ * Tue Oct 29 2019 Miro Hrončok <mhroncok@redhat.com> - 19.10~b0-1
|
| |
+ - Update to 19.10b0
|
| |
+
|
| |
+ * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 19.3b0-5
|
| |
+ - Rebuilt for Python 3.8.0rc1 (#1748018)
|
| |
+
|
| |
+ * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 19.3b0-4
|
| |
+ - Rebuilt for Python 3.8
|
| |
+
|
| |
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.3b0-3
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
| |
|
| |
See https://pagure.io/fesco/issue/2259