Compare commits

..

No commits in common. "f112f5f4f078f961f78453351a2925c02658c4f5" and "ce541f9697dfbda800a5fc549c07da474ed517d4" have entirely different histories.

5 changed files with 22 additions and 73 deletions

View File

@ -1,25 +0,0 @@
From 64ed7c83687cb7ee313ac3da62895ae2f6de215b Mon Sep 17 00:00:00 2001
From: desert-sailor <dxwangk@isoftstone.com>
Date: Thu, 1 Jun 2023 16:53:02 +0800
Subject: [PATCH] fix the multipkg mis-check
---
flit_core/flit_core/common.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py
index 68d91bb..3c43522 100644
--- a/flit_core/flit_core/common.py
+++ b/flit_core/flit_core/common.py
@@ -29,7 +29,7 @@ class Module(object):
src_py_file = directory / 'src' / (name_as_path+'.py')
existing = set()
- if pkg_dir.is_dir():
+ if pkg_dir.is_dir() and name_as_path.strip() != "build":
self.path = pkg_dir
self.is_package = True
self.prefix = ''
--
2.33.0

BIN
flit-1.0.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,59 +1,45 @@
%global _empty_manifest_terminate_build 0
Name: python-flit Name: python-flit
Version: 3.8.0 Version: 1.0
Release: 2 Release: 5
Summary: Simplified packaging of Python modules Summary: Simplified packaging of Python modules
License: BSD-3-Clause License: BSD and ASL 2.0 and Python
URL: https://flit.readthedocs.io/en/latest/ URL: https://flit.readthedocs.io/en/latest/
Source0: https://files.pythonhosted.org/packages/28/c6/c399f38dab6d3a2518a50d334d038083483a787f663743d713f1d245bde3/flit-3.8.0.tar.gz Source0: https://src.fedoraproject.org/repo/extras/python-flit/flit-%{version}.tar.gz
Patch1: 0001-fix-the-multipkg-mis-check.patch
BuildArch: noarch
Requires: python3-requests python3-docutils python3-toml python3-setuptools BuildArch: noarch
Requires: python3-flit-core = %{version}-%{release} BuildRequires: python3-devel python3-pip python3-requests python3-docutils python3-pygments python3-pytoml
Provides: bundled(python-tornado)
%description %description
Flit is a simple way to put Python packages and modules on PyPI. Flit is a simple way to put Python packages and modules on PyPI.
The specific usage is introduced on the website(https://flit.readthedocs.io/en/latest/), or query README. The specific usage is introduced on the website(https://flit.readthedocs.io/en/latest/), or query README.
%package -n python3-flit %package -n python3-flit
Summary: Simplified packaging of Python modules Summary: Simplified packaging of Python modules
Provides: python-flit = %{version}-%{release} %{?python_provide:%python_provide python3-flit}
BuildRequires: python3-devel python3-pip python3-requests python3-docutils python3-pygments python3-pytoml
Requires: python3-requests python3-docutils python3-pytoml
%global __requires_exclude ^python3.7dist\\(requests-download\\)
Recommends: python3-pygments
%description -n python3-flit %description -n python3-flit
Flit is a simple way to put Python packages and modules on PyPI. Flit is a simple way to put Python packages and modules on PyPI.
The specific usage is introduced on the website(https://flit.readthedocs.io/en/latest/), or query README. The specific usage is introduced on the website(https://flit.readthedocs.io/en/latest/), or query README.
%package -n python3-flit-core
Summary: PEP 517 build backend for packages using Flit
Conflicts: python3-flit < 2.1.0-2
Requires: python3-toml
%description -n python3-flit-core
This provides a PEP 517 build backend for packages using Flit. The only public interface is the API specified by PEP 517, at flit_core.buildapi.
%prep %prep
%autosetup -p1 -n flit-%{version} %autosetup -n flit-%{version}
%build %build
export FLIT_NO_NETWORK=1 export FLIT_NO_NETWORK=1
pushd flit_core XDG_CACHE_HOME=$PWD/.cache %{__python3} -m flit build --format wheel
%pyproject_build
popd
export PYTHONPATH=$PWD:$PWD/flit_core
%pyproject_build
%install %install
cd flit_core %py3_install_wheel flit-%{version}-py3-none-any.whl
pip3 install -I build/flit_core-%{version}-py3-none-any.whl --root %{buildroot} --no-deps
cd -
pip3 install -I build/flit-%{version}-py3-none-any.whl --root %{buildroot} --no-deps
%files -n python3-flit-core
%license LICENSE
%doc flit_core/README.rst
%{python3_sitelib}/flit_core-*.dist-info/
%{python3_sitelib}/flit_core/
%files -n python3-flit %files -n python3-flit
%{python3_sitelib}/* %{python3_sitelib}/*
@ -61,15 +47,7 @@ pip3 install -I build/flit-%{version}-py3-none-any.whl --root %{buildroot} --no-
%license LICENSE %license LICENSE
%doc README.rst %doc README.rst
%changelog %changelog
* Thu Jun 1 2023 Dongxing Wang <dxwangk@isoftstone.com> - 3.8.0-2
- fix multipkg mis-check
* Tue Apr 25 2023 liyanan <thistleslyn@163.com> - 3.8.0-1
- Update to 3.8.0
* Tue Jun 16 2020 hanxinke <hanxinke@huawei.com> - 1.0-6
- update python version
* Thu Nov 21 2019 Wanjiankang <wanjiankang@huawei.com> - 1.0-5 * Thu Nov 21 2019 Wanjiankang <wanjiankang@huawei.com> - 1.0-5
- Package Init - Package Init

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: takluyver/flit
tag_prefix: ^v
seperator: .