`pkgs/sage-{docbuild,setup,sws2rst}`: Migrate from `setup.cfg` to `pyproject.toml` #36562

mkoeppe · 2023-10-28T18:07:54Z

Split out from and part of Migrate from setup.cfg to pyproject.toml #33577

📝 Checklist

The title is concise, informative, and self-explanatory.
The description explains in detail what this PR is about.
I have linked a relevant issue or discussion.
I have created tests covering the changes.
I have updated the documentation accordingly.

⌛ Dependencies

…toml-0.11.3

…2toml-0.13

…ml-0.13

kiwifb · 2023-10-30T00:30:52Z

pkgs/sage-docbuild/pyproject.toml

+    "Topic :: Scientific/Engineering :: Mathematics",
+]
+urls = {Homepage = "https://www.sagemath.org"}
+dependencies = ["sphinx"]


Doesn't sage_docbuild also depend on jupyter-sphinx?

I think we are treating the dependencies on Sphinx extensions (declared in sage_docbuild/conf.py) as belonging to sagemath_doc_html

I understand the logic but I am not very comfortable with it. Part of me feels that if you are going that route, sphinx should be treated the same way. It is not needed at install either, I think.

A difference is that sphinx is imported by sage_docbuild.sphinxbuild.

I do not think I will argue with that one. Where to declare runtime dependency seems to be a bit unsettled.

kiwifb · 2023-10-30T00:32:42Z

pkgs/sage-setup/pyproject.toml

+requires-python = ">=3.9, <3.12"
+dependencies = [
+    "pkgconfig",
+    "jinja2",


What about cython? I believe both jinja2 and cython are runtime dependencies.

The distributions that use Cython declare that in their build-system requires. I don't think we need it here.

That's an argument for distribution to declare their use of jinja2 as well. And there is actually no call to pkgconfig in sage_setup.

Probably jinja2 should actually be an optional dependency (formerly known as extras-require) because only the packages that you sage_setup.autogen use it.

Good point about pkgconfig.

After modularization, there will be more uses, but I've made the change now.

kiwifb

Hit the wrong button, this is not an extra review task.

pkgs/sage-setup/pyproject.toml

+requires-python = ">=3.9, <3.12"
+dependencies = [
+    "pkgconfig",
+    "jinja2",


…onal dep

kiwifb

LGTM

kiwifb · 2023-10-30T01:15:17Z

Last comment that came to me after approving the other request. Should we add 3.12 in the list of supported python?

kiwifb · 2023-10-30T01:16:03Z

Last comment that came to me after approving the other request. Should we add 3.12 in the list of supported python?

And I meant to post that in #36563

mkoeppe · 2023-10-30T01:18:39Z

We should probably do that soon, but not in these PRs.

kiwifb · 2023-10-30T01:20:33Z

OK

kiwifb

Let's get going.

…agemath#36562

mkoeppe · 2023-10-30T01:25:08Z

Thank you!

…o build-system requires

github-actions · 2023-11-20T02:33:36Z

Documentation preview for this PR (built with commit 784ecc8; changes) is ready! 🎉

mkoeppe · 2023-11-23T21:11:02Z

@kiwifb OK to set to positive review after the last changes?

kiwifb

Let's ship it.

mkoeppe · 2023-11-23T22:01:17Z

Thank you!

…`setup.cfg` to `pyproject.toml`     - Split out from and part of sagemath#33577  ### 📝 Checklist     - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies   URL: sagemath#36562 Reported by: Matthias Köppe Reviewer(s): François Bissey, Matthias Köppe

This modernization eliminates some deprecation warnings during installation. It may help solve the problem of the disappearing sage- conf (https://groups.google.com/g/sage- release/c/J6mGYH56FKA/m/m9yHivCWAgAJ, https://groups.google.com/g/sage- release/c/dvPti2UkyjQ/m/2jeUZROzAwAJ, https://groups.google.com/g/sage- release/c/DeqhtAgi2es/m/DYq13owvAQAJ). No change to how sagelib is installed; this will be taken care of separately (sagemath#34209). In combination with sagemath#36562, which adds `pyproject.toml` for sage- docbuild, sage-setup, sage-sws2rst, also these distributions are switched to the modern editable install.    ### 📝 Checklist     - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies   URL: sagemath#36751 Reported by: Matthias Köppe Reviewer(s): John H. Palmieri

Matthias Koeppe added 4 commits October 28, 2023 10:57

pkgs/sage-sws2rst (pyproject.toml): Convert from setup.cfg using ini2…

d514d8d

…toml-0.11.3

pkgs/sage-docbuild (pyproject.toml): Convert from setup.cfg using ini…

6fa10e9

…2toml-0.13

pkgs/sage-setup (pyproject.toml): Convert from setup.cfg using ini2to…

c67bd9a

…ml-0.13

pkgs/sage-setup/pyproject.toml: Remove Python 3.8

2b94d8d

mkoeppe added p: minor / 4 s: needs review c: distribution labels Oct 28, 2023

mkoeppe self-assigned this Oct 28, 2023

mkoeppe requested a review from kiwifb October 29, 2023 21:00

kiwifb reviewed Oct 30, 2023

View reviewed changes

pkgs/sage-setup/pyproject.toml Outdated

requires-python = ">=3.9, <3.12"

dependencies = [

"pkgconfig",

"jinja2",

This comment was marked as duplicate.

Sign in to view

Matthias Koeppe added 2 commits October 29, 2023 18:06

pkgs/sage-setup/pyproject.toml: Remove pkgconfig, make jinja2 an opti…

02799e4

…onal dep

src/pyproject.toml.m4: Use sage_setup[autogen]

0eef981

kiwifb approved these changes Oct 30, 2023

View reviewed changes

kiwifb added s: positive review and removed s: needs review labels Oct 30, 2023

kiwifb approved these changes Oct 30, 2023

View reviewed changes

mkoeppe added a commit to mkoeppe/sage that referenced this pull request Oct 30, 2023

pkgs/sagemath-{categories,modules}: Require sage-setup[autogen] after s…

3df0c71

…agemath#36562

mkoeppe added the s: needs work label Oct 30, 2023

Matthias Koeppe added 2 commits October 29, 2023 21:35

pkgs/sagemath-{bliss,coxeter3,...}/pyproject.toml.m4: Add pkgconfig t…

7da8834

…o build-system requires

pkgs/sagemath-{objects,categories}/pyproject.toml.m4: Add pkgconfig t…

815ce13

…o build-system requires

mkoeppe added s: needs review and removed s: positive review s: needs work labels Oct 30, 2023

Merge branch 'develop' into sage_sws2rst_pyproject_toml

0c25b8f

vbraun force-pushed the develop branch from 883e05f to e349b00 Compare November 12, 2023 16:25

Merge branch 'develop' into sage_sws2rst_pyproject_toml

784ecc8

kiwifb approved these changes Nov 23, 2023

View reviewed changes

kiwifb added s: positive review and removed s: needs review labels Nov 23, 2023

vbraun merged commit e86721e into sagemath:develop Dec 6, 2023
26 checks passed

mkoeppe added this to the sage-10.3 milestone Dec 6, 2023

github-actions bot removed the s: positive review label Dec 6, 2023

mkoeppe deleted the sage_sws2rst_pyproject_toml branch January 4, 2024 20:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`pkgs/sage-{docbuild,setup,sws2rst}`: Migrate from `setup.cfg` to `pyproject.toml` #36562

`pkgs/sage-{docbuild,setup,sws2rst}`: Migrate from `setup.cfg` to `pyproject.toml` #36562

mkoeppe commented Oct 28, 2023

kiwifb Oct 30, 2023

mkoeppe Oct 30, 2023

kiwifb Oct 30, 2023 •

edited

Loading

mkoeppe Oct 30, 2023

kiwifb Oct 30, 2023

kiwifb Oct 30, 2023

mkoeppe Oct 30, 2023

kiwifb Oct 30, 2023

mkoeppe Oct 30, 2023

mkoeppe Oct 30, 2023

This comment was marked as duplicate.

mkoeppe Oct 30, 2023

kiwifb left a comment

This comment was marked as duplicate.

kiwifb left a comment

kiwifb commented Oct 30, 2023

kiwifb commented Oct 30, 2023

mkoeppe commented Oct 30, 2023

kiwifb commented Oct 30, 2023

kiwifb left a comment

mkoeppe commented Oct 30, 2023

github-actions bot commented Nov 20, 2023

mkoeppe commented Nov 23, 2023

kiwifb left a comment

mkoeppe commented Nov 23, 2023

pkgs/sage-{docbuild,setup,sws2rst}: Migrate from setup.cfg to pyproject.toml #36562

pkgs/sage-{docbuild,setup,sws2rst}: Migrate from setup.cfg to pyproject.toml #36562

Conversation

mkoeppe commented Oct 28, 2023

📝 Checklist

⌛ Dependencies

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kiwifb Oct 30, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as duplicate.

Choose a reason for hiding this comment

kiwifb left a comment

Choose a reason for hiding this comment

This comment was marked as duplicate.

kiwifb left a comment

Choose a reason for hiding this comment

kiwifb commented Oct 30, 2023

kiwifb commented Oct 30, 2023

mkoeppe commented Oct 30, 2023

kiwifb commented Oct 30, 2023

kiwifb left a comment

Choose a reason for hiding this comment

mkoeppe commented Oct 30, 2023

github-actions bot commented Nov 20, 2023

mkoeppe commented Nov 23, 2023

kiwifb left a comment

Choose a reason for hiding this comment

mkoeppe commented Nov 23, 2023

`pkgs/sage-{docbuild,setup,sws2rst}`: Migrate from `setup.cfg` to `pyproject.toml` #36562

`pkgs/sage-{docbuild,setup,sws2rst}`: Migrate from `setup.cfg` to `pyproject.toml` #36562

kiwifb Oct 30, 2023 •

edited

Loading