#4 Restore /bin/flit
Closed 2 months ago by zbyszek. Opened 2 months ago by zbyszek.
rpms/ zbyszek/python-flit restore-executable  into  master

file modified
+13 -19

@@ -11,7 +11,7 @@ 

  

  Name:		python-%{srcname}

  Version:	2.1.0

- Release:	1%{?dist}

+ Release:	2%{?dist}

  Summary:	Simplified packaging of Python modules

  

  # ./flit/logo.py  under ASL 2.0 license

@@ -23,6 +23,7 @@ 

  

  BuildArch:	noarch

  BuildRequires:	python3-devel

+ BuildRequires:	python3-setuptools

  BuildRequires:	python3-pip

  BuildRequires:	python3-requests

  BuildRequires:	python3-docutils

@@ -42,7 +43,7 @@ 

  # ./flit/logo.py unkown version

  Provides:    bundled(python-tornado)

  

- %description

+ %global _description %{expand:

  Flit is a simple way to put Python packages and modules on PyPI.

  

  Flit only creates packages in the new 'wheel' format. People using older

@@ -53,8 +54,9 @@ 

  included automatically.

  

  Flit requires Python 3, but you can use it to distribute modules for Python 2,

- so long as they can be imported on Python 3.

+ as long as they can be imported on Python 3.}

  

+ %description %_description

  

  %package -n python3-%{srcname}

  Summary:	%{summary}

@@ -70,22 +72,11 @@ 

  # soft dependency: (WARNING) Cannot analyze code. Pygments package not found.

  Recommends:	python3-pygments

  

- %description -n python3-%{srcname}

- Flit is a simple way to put Python packages and modules on PyPI.

- 

- Flit only creates packages in the new 'wheel' format. People using older

- versions of pip (<1.5) or easy_install will not be able to install them.

- 

- Flit packages a single importable module or package at a time, using the import

- name as the name on PyPI. All subpackages and data files within a package are

- included automatically.

- 

- Flit requires Python 3, but you can use it to distribute modules for Python 2,

- so long as they can be imported on Python 3.

- 

+ %description -n python3-%{srcname} %_description

  

  %prep

  %autosetup -n %{srcname}-%{version}

+ sed -r -i 's/from distutils.core import setup/from setuptools import setup/' setup.py

  

  %build

  export FLIT_NO_NETWORK=1

@@ -98,18 +89,21 @@ 

  

  %if 0%{?with_test}

  %check

- py.test-3

+ pytest-3

  %endif

  

  

  %files -n python3-%{srcname}

  %license LICENSE

  %doc README.rst

- %{python3_sitelib}/%{srcname}*egg-info

+ %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/

  %{python3_sitelib}/%{srcname}/

- 

+ %{_bindir}/flit

  

  %changelog

+ * Sat Dec 14 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.1.0-2

+ - Use setuptools for setup, restore missing /bin/flit (#1783610)

+ 

  * Tue Dec 03 2019 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.1.0-1

  - Update to 2.1.0

  

no initial comment

setuptools is not buildrequired.

FTR I don't agree this is the correct approach, but if it gets things fixed, we can temporarily ship it.

add a trailing slash.
setuptools is not buildrequired.

Both done.

FTR I don't agree this is the correct approach, but if it gets things fixed, we can temporarily ship it.

Yeah, it seems to fix things.

rebased onto b043693

2 months ago

Does it install the flit_core module?

FTR I'm working on a PR that uses flit_core to install flit and flit_core.

Pull-Request has been closed by zbyszek

2 months ago