From f13e50aa5f179c971f9522653c935c92134b1a1ee0e5ea8a2ec0f72ea118b25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 10 Jul 2023 12:33:07 +0000 Subject: [PATCH 1/2] Accepting request 1097928 from home:benoit_monin:branches:devel:languages:python - update to version 0.4 - drop skip_python2 and require python >= 3.7 - drop setuptools and requires pip and flit-core to build the rpm - add pytest as a build requirement and run the tests OBS-URL: https://build.opensuse.org/request/show/1097928 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-editables?expand=0&rev=5 --- editables-0.3.tar.gz | 3 --- editables-0.4.tar.gz | 3 +++ python-editables.changes | 13 +++++++++++++ python-editables.spec | 16 ++++++++++------ 4 files changed, 26 insertions(+), 9 deletions(-) delete mode 100644 editables-0.3.tar.gz create mode 100644 editables-0.4.tar.gz diff --git a/editables-0.3.tar.gz b/editables-0.3.tar.gz deleted file mode 100644 index 5089646..0000000 --- a/editables-0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a -size 4668 diff --git a/editables-0.4.tar.gz b/editables-0.4.tar.gz new file mode 100644 index 0000000..a625099 --- /dev/null +++ b/editables-0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc322c42e7ccaf19600874035a4573898d88aadd07e177c239298135b75da772 +size 14440 diff --git a/python-editables.changes b/python-editables.changes index 54c3322..482a828 100644 --- a/python-editables.changes +++ b/python-editables.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jul 10 09:59:29 UTC 2023 - Benoît Monin + +- update to version 0.4: + * Add a new add_to_subpackage method + * Add type annotations + * Internal admin: Switch to nox for automation + * Internal admin: Switch to ruff for linting + * Internal admin: Switch from setuptools to flit_core +- drop skip_python2 and require python >= 3.7 +- drop setuptools and requires pip and flit-core to build the rpm +- add pytest as a build requirement and run the tests + ------------------------------------------------------------------- Fri Apr 21 12:24:32 UTC 2023 - Dirk Müller diff --git a/python-editables.spec b/python-editables.spec index 4b60133..1f0736a 100644 --- a/python-editables.spec +++ b/python-editables.spec @@ -16,17 +16,18 @@ # -%define skip_python2 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?sle15_python_module_pythons} Name: python-editables -Version: 0.3 +Version: 0.4 Release: 0 Summary: Editable installations License: MIT URL: https://github.com/pfmoore/editables Source: https://files.pythonhosted.org/packages/source/e/editables/editables-%{version}.tar.gz -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module flit-core >= 3.3} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -48,12 +49,15 @@ Python, without needing a reinstall. dos2unix -c ascii README.md %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +%pytest + %files %{python_files} %doc README.md %license LICENSE.txt From 6e376fffff3b08590b1b2930b79ff022056c651990f590d3d6d52b9ede02cdd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 11 Jul 2023 10:43:16 +0000 Subject: [PATCH 2/2] Accepting request 1098094 from home:mcalabkova:branches:devel:languages:python - Convert to multibuild to break a build cycle OBS-URL: https://build.opensuse.org/request/show/1098094 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-editables?expand=0&rev=6 --- _multibuild | 3 +++ python-editables.changes | 5 +++++ python-editables.spec | 25 ++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) 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 + diff --git a/python-editables.changes b/python-editables.changes index 482a828..ec84eb4 100644 --- a/python-editables.changes +++ b/python-editables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 11 10:38:18 UTC 2023 - Markéta Machová + +- Convert to multibuild to break a build cycle + ------------------------------------------------------------------- Mon Jul 10 09:59:29 UTC 2023 - Benoît Monin diff --git a/python-editables.spec b/python-editables.spec index 1f0736a..5c37f15 100644 --- a/python-editables.spec +++ b/python-editables.spec @@ -1,5 +1,5 @@ # -# spec file for package python-editables +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -16,8 +16,16 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -%{flavor} +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %{?sle15_python_module_pythons} -Name: python-editables +Name: python-editables%{psuffix} Version: 0.4 Release: 0 Summary: Editable installations @@ -27,10 +35,13 @@ Source: https://files.pythonhosted.org/packages/source/e/editables/edita BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module flit-core >= 3.3} BuildRequires: %{python_module pip} -BuildRequires: %{python_module pytest} BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: python-rpm-macros +%if %{with test} +BuildRequires: %{python_module editables = %{version}} +BuildRequires: %{python_module pytest} +%endif BuildArch: noarch %python_subpackages @@ -49,19 +60,27 @@ Python, without needing a reinstall. dos2unix -c ascii README.md %build +%if !%{with test} %pyproject_wheel +%endif %install +%if !%{with test} %pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check +%if %{with test} %pytest +%endif +%if !%{with test} %files %{python_files} %doc README.md %license LICENSE.txt %{python_sitelib}/editables %{python_sitelib}/editables-%{version}*-info +%endif %changelog