On Wed, 01 Dec 2021 14:07:52 -0500 Scott Kitterman <deb...@kitterman.com> wrote: > On Sun, 28 Nov 2021 14:17:14 +0000 "Rebecca N. Palmer" > <rebecca_pal...@zoho.com> wrote: > > Package: python3-poliastro > > Version: 0.15.2-3 > > Severity: serious > > > > Fails to build with the error > > > > E: pybuild pybuild:354: build: plugin flit failed with: Use [project] > > table for metadata or [tool.flit.metadata], not both. > > this should be pretty trivially resolved by dropping Revert-the-adoption- > PEP-621-metadata.patch and bumping the minimum flit version in build-depends to > 3.2. Now that we have flit 3.3 in the archive, using the PEP 621 metadata is > not a problem.
Confirmed. NMU diff attached. I'm not going to upload this now, but I may later. I'd prefer one of the maintainers take care of it. Scott K
diff -Nru poliastro-0.15.2/debian/changelog poliastro-0.15.2/debian/changelog
--- poliastro-0.15.2/debian/changelog 2021-08-28 09:09:23.000000000 -0400
+++ poliastro-0.15.2/debian/changelog 2021-12-01 17:30:34.000000000 -0500
@@ -1,3 +1,12 @@
+poliastro (0.15.2-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop debian/patches/Revert-the-adoption-PEP-621-metadata.patch and bump
+ minimum flit version in build-depends to 3.2 (to ensure PEP 621 support)
+ in order fo fix FTBFS with flit 3.3 (Closes: #1000753)
+
+ -- Scott Kitterman <sc...@kitterman.com> Wed, 01 Dec 2021 17:30:34 -0500
+
poliastro (0.15.2-3) unstable; urgency=medium
* Negate the 32-bit test in xfail: was accidently reversed
diff -Nru poliastro-0.15.2/debian/control poliastro-0.15.2/debian/control
--- poliastro-0.15.2/debian/control 2021-08-24 10:56:53.000000000 -0400
+++ poliastro-0.15.2/debian/control 2021-12-01 17:30:29.000000000 -0500
@@ -5,7 +5,7 @@
Uploaders: Ole Streicher <oleb...@debian.org>
Build-Depends: debhelper-compat (= 13),
dh-python,
- flit,
+ flit (>= 3.2),
python3-all,
python3-astropy (>= 3.2~),
python3-astroquery,
diff -Nru poliastro-0.15.2/debian/patches/Revert-the-adoption-PEP-621-metadata.patch poliastro-0.15.2/debian/patches/Revert-the-adoption-PEP-621-metadata.patch
--- poliastro-0.15.2/debian/patches/Revert-the-adoption-PEP-621-metadata.patch 2021-08-28 08:02:51.000000000 -0400
+++ poliastro-0.15.2/debian/patches/Revert-the-adoption-PEP-621-metadata.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,88 +0,0 @@
-From: =?utf-8?q?Juan_Luis_Cano_Rodr=C3=ADguez?= <hello@juanlu.space>
-Date: Fri, 23 Apr 2021 12:03:06 +0200
-Subject: Revert the adoption PEP 621 metadata
-
-https://github.com/takluyver/flit/issues/436
----
- pyproject.toml | 36 +++++++++++++++---------------------
- 1 file changed, 15 insertions(+), 21 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index b6bddd5..3fa7389 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,28 +1,18 @@
- [build-system]
- requires = [
-- "flit_core >=3.2,<3.3",
-+ "flit_core >=2.0,<4",
- "wheel",
- "oldest-supported-numpy",
- ]
- build-backend = "flit_core.buildapi"
-
--[project]
--name = "poliastro"
--readme = "README.md"
--requires-python = ">=3.7,<3.10"
--license = {file = "COPYING"}
--authors = [
-- {name = "Juan Luis Cano RodrÃguez", email = "hello@juanlu.space"}
--]
--keywords = [
-- "aero",
-- "aerospace",
-- "engineering",
-- "astrodynamics",
-- "orbits",
-- "kepler",
-- "orbital mechanics"
--]
-+[tool.flit.metadata]
-+module = "poliastro"
-+author = "Juan Luis Cano RodrÃguez"
-+author-email = "hello@juanlu.space"
-+description-file = "README.md"
-+home-page = "https://github.com/poliastro/poliastro/";
-+keywords = "aero,aerospace,engineering,astrodynamics,orbits,kepler,orbital mechanics"
- classifiers = [
- "License :: OSI Approved :: MIT License",
- "Development Status :: 4 - Beta",
-@@ -41,7 +31,8 @@ classifiers = [
- "Topic :: Scientific/Engineering :: Physics",
- "Topic :: Scientific/Engineering :: Astronomy",
- ]
--dependencies = [
-+requires-python = ">=3.7,<3.10"
-+requires = [
- "astropy >=3.2,<5",
- "astroquery >=0.3.9",
- "cached_property ; python_version<'3.8'",
-@@ -55,7 +46,6 @@ dependencies = [
- "pyerfa",
- "scipy >=1.4.0",
- ]
--dynamic = ["version", "description"]
-
- [project.urls]
- Home-Page = "https://www.poliastro.space";
-@@ -64,7 +54,7 @@ Source = "https://github.com/poliastro/poliastro";
- Tracker = "https://github.com/poliastro/poliastro/issues";
- Funding = "https://opencollective.com/poliastro";
-
--[project.optional-dependencies]
-+[tool.flit.metadata.requires-extra]
- jupyter = ["notebook", "ipywidgets>=7.6"]
- cesium = ["czml3 ~=0.5.3"]
- dev = [
-@@ -95,6 +85,10 @@ dev = [
- "sphinx-notfound-page",
- ]
-
-+[tool.flit.metadata.urls]
-+Source = "https://github.com/poliastro/poliastro";
-+Tracker = "https://github.com/poliastro/poliastro/issues";
-+
- [tool.flit.sdist]
- include = [
- "src/poliastro/atmosphere/data/coesa62.dat",
diff -Nru poliastro-0.15.2/debian/patches/series poliastro-0.15.2/debian/patches/series
--- poliastro-0.15.2/debian/patches/series 2021-08-28 08:02:51.000000000 -0400
+++ poliastro-0.15.2/debian/patches/series 2021-12-01 17:30:03.000000000 -0500
@@ -1,2 +1 @@
-Revert-the-adoption-PEP-621-metadata.patch
Mark-tests-failing-on-32-bit-archs-as-xfail.patch
signature.asc
Description: This is a digitally signed message part.
