From a7f1ef564565a7911416dd5b4ea3055bdd8fb5a98605e5b55b564857921325c6 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 15 Oct 2021 17:40:12 +0000 Subject: [PATCH 1/3] - Update to Version 3.4 * Python 3.6 or above is now required, both for flit and flit_core. * Add a --setup-py option to flit build and flit publish, and a warning when neither this nor --no-setup-py are specified (PR #431). A future version will stop generating setup.py files in sdists by default. * Add support for standardised editable installs - pip install -e - according to PEP 660 (PR #400). * Add a --pypirc option for flit publish to specify an alternative path to a .pypirc config file describing package indexes (PR #434). * Fix installing dependencies specified in a [project] table (PR #433) * Fix building wheels when SOURCE_DATE_EPOCH (see Reproducible builds) is set to a date before 1980 (PR #448). * Switch to using the tomli TOML parser, in common with other packaging projects (PR #438). This supports TOML version 1.0. * Add a document on Bootstrapping (PR #441). - Release Version 3.3 * PKG-INFO files in sdists are now generated the same way as METADATA in wheels, fixing some issues with sdists (PR #410). * flit publish now sends SHA-256 hashes, fixing uploads to GitLab package repositories (PR #416). * The [project] metadata table from PEP 621 is now fully supported and documented. Projects using this can now specify requires = ["flit_core >=3.2,<4"] in the OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flit-core?expand=0&rev=15 --- flit_core-3.2.0.tar.gz | 3 --- flit_core-3.4.0.tar.gz | 3 +++ python-flit-core.changes | 37 +++++++++++++++++++++++++++++++++++++ python-flit-core.spec | 27 ++++++++++++++++++++++----- 4 files changed, 62 insertions(+), 8 deletions(-) delete mode 100644 flit_core-3.2.0.tar.gz create mode 100644 flit_core-3.4.0.tar.gz diff --git a/flit_core-3.2.0.tar.gz b/flit_core-3.2.0.tar.gz deleted file mode 100644 index 267fe09..0000000 --- a/flit_core-3.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff87f25c5dbc24ef30ea334074e35030e4885e4c5de3bf4e21f15746f6d99431 -size 27417 diff --git a/flit_core-3.4.0.tar.gz b/flit_core-3.4.0.tar.gz new file mode 100644 index 0000000..6b2d51f --- /dev/null +++ b/flit_core-3.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29468fa2330969167d1f5c23eb9c0661cb6dacfcd46f361a274609a7f4197530 +size 27151 diff --git a/python-flit-core.changes b/python-flit-core.changes index 7ac5f86..387bd65 100644 --- a/python-flit-core.changes +++ b/python-flit-core.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Fri Oct 15 17:32:51 UTC 2021 - Ben Greiner + +- Update to Version 3.4 + * Python 3.6 or above is now required, both for flit and + flit_core. + * Add a --setup-py option to flit build and flit publish, + and a warning when neither this nor --no-setup-py are + specified (PR #431). A future version will stop + generating setup.py files in sdists by default. + * Add support for standardised editable installs - pip + install -e - according to PEP 660 (PR #400). + * Add a --pypirc option for flit publish to specify an + alternative path to a .pypirc config file describing + package indexes (PR #434). + * Fix installing dependencies specified in a [project] + table (PR #433) + * Fix building wheels when SOURCE_DATE_EPOCH (see + Reproducible builds) is set to a date before 1980 (PR + #448). + * Switch to using the tomli TOML parser, in common with + other packaging projects (PR #438). This supports TOML + version 1.0. + * Add a document on Bootstrapping (PR #441). +- Release Version 3.3 + * PKG-INFO files in sdists are now generated the same way + as METADATA in wheels, fixing some issues with sdists + (PR #410). + * flit publish now sends SHA-256 hashes, fixing uploads + to GitLab package repositories (PR #416). + * The [project] metadata table from PEP 621 is now fully + supported and documented. Projects using this can now + specify requires = ["flit_core >=3.2,<4"] in the + [build-system] table. +- Multibuild: break another depcycle with + pytest/importlib-metadata/tomli + ------------------------------------------------------------------- Wed Apr 14 19:29:23 UTC 2021 - Matthias Bach diff --git a/python-flit-core.spec b/python-flit-core.spec index 5fbb02d..408db70 100644 --- a/python-flit-core.spec +++ b/python-flit-core.spec @@ -1,5 +1,5 @@ # -# spec file for package python-flit-core +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,21 +16,32 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -Name: python-flit-core -Version: 3.2.0 +Name: python-flit-core%{nil} +Version: 3.4.0 Release: 0 Summary: Distribution-building parts of Flit License: BSD-3-Clause URL: https://github.com/takluyver/flit Source: https://files.pythonhosted.org/packages/source/f/flit-core/flit_core-%{version}.tar.gz BuildRequires: %{python_module pip} +%if %{with test} BuildRequires: %{python_module pytest} BuildRequires: %{python_module testpath} -BuildRequires: %{python_module toml} +BuildRequires: %{python_module tomli} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-toml +Requires: python-tomli BuildArch: noarch %python_subpackages @@ -43,17 +54,23 @@ Flit is a simple way to put Python packages and modules on PyPI. %build %pyproject_wheel +%if !%{with test} %install %pyproject_install %{python_expand rm -r %{buildroot}%{$python_sitelib}/flit_core/tests %fdupes %{buildroot}%{$python_sitelib} } +%endif +%if %{with test} %check %pytest +%endif +%if !%{with test} %files %{python_files} %{python_sitelib}/flit_core %{python_sitelib}/flit_core-%{version}*-info +%endif %changelog From c54c411b65aada4d257137f5d93e053b1e4268b4cd06daef12340e2a15b10a69 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 15 Oct 2021 18:02:33 +0000 Subject: [PATCH 2/3] . OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flit-core?expand=0&rev=16 --- _multibuild | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + From 60f81d0e0458fc99c29637fa6e608d59cafa9d94ac7678cd6d91e170663de29d Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 15 Oct 2021 19:31:28 +0000 Subject: [PATCH 3/3] Accepting request 925547 from home:bnavigator:branches:devel:languages:python - Break build cycle by using upstream recommended bootstrap method https://flit.readthedocs.io/en/latest/bootstrap.html OBS-URL: https://build.opensuse.org/request/show/925547 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flit-core?expand=0&rev=17 --- python-flit-core.changes | 6 ++++++ python-flit-core.spec | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/python-flit-core.changes b/python-flit-core.changes index 387bd65..2f71847 100644 --- a/python-flit-core.changes +++ b/python-flit-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 15 19:27:43 UTC 2021 - Ben Greiner + +- Break build cycle by using upstream recommended bootstrap method + https://flit.readthedocs.io/en/latest/bootstrap.html + ------------------------------------------------------------------- Fri Oct 15 17:32:51 UTC 2021 - Ben Greiner diff --git a/python-flit-core.spec b/python-flit-core.spec index 408db70..5fe4242 100644 --- a/python-flit-core.spec +++ b/python-flit-core.spec @@ -26,14 +26,14 @@ %endif %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -Name: python-flit-core%{nil} +Name: python-flit-core%{psuffix} Version: 3.4.0 Release: 0 Summary: Distribution-building parts of Flit License: BSD-3-Clause URL: https://github.com/takluyver/flit Source: https://files.pythonhosted.org/packages/source/f/flit-core/flit_core-%{version}.tar.gz -BuildRequires: %{python_module pip} +BuildRequires: %{python_module base >= 3.6} %if %{with test} BuildRequires: %{python_module pytest} BuildRequires: %{python_module testpath} @@ -41,6 +41,7 @@ BuildRequires: %{python_module tomli} %endif BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: unzip Requires: python-tomli BuildArch: noarch %python_subpackages @@ -52,14 +53,18 @@ Flit is a simple way to put Python packages and modules on PyPI. %setup -q -n flit_core-%{version} %build -%pyproject_wheel +# https://flit.readthedocs.io/en/latest/bootstrap.html +python3 build_dists.py %if !%{with test} %install -%pyproject_install -%{python_expand rm -r %{buildroot}%{$python_sitelib}/flit_core/tests -%fdupes %{buildroot}%{$python_sitelib} +%{python_expand # do manually what pip would do +mkdir -p %{buildroot}%{$python_sitelib} +unzip dist/flit_core-%{version}-py3-none-any.whl -d %{buildroot}%{$python_sitelib} +rm -r %{buildroot}%{$python_sitelib}/flit_core/tests } +%python_compileall +%python_expand %fdupes %{buildroot}%{$python_sitelib} %endif %if %{with test}