Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove workarounds for packages that use flit_core or poetry_core as build system #32483

Closed
mkoeppe opened this issue Sep 6, 2021 · 17 comments
Closed

Comments

@mkoeppe
Copy link
Member

mkoeppe commented Sep 6, 2021

These workarounds were added in #29803.

$ git grep -B 3 'rm.*pyproject'
build/pkgs/entrypoints/spkg-install.in-# Make sure that modern pip uses the generated setup.py
build/pkgs/entrypoints/spkg-install.in-# that is distributed with the PyPI tarball,
build/pkgs/entrypoints/spkg-install.in-# so we do not have to have flit.  Trac #29803.
build/pkgs/entrypoints/spkg-install.in:rm -f pyproject.toml
--
build/pkgs/pkgconfig/spkg-install.in-# Make sure that modern pip uses the generated setup.py
build/pkgs/pkgconfig/spkg-install.in-# that is distributed with the PyPI tarball,
build/pkgs/pkgconfig/spkg-install.in-# so we do not have to have poetry.  Trac #29803.
build/pkgs/pkgconfig/spkg-install.in:rm -f pyproject.toml
--
build/pkgs/terminado/spkg-install.in-# Make sure that modern pip uses the generated setup.py
build/pkgs/terminado/spkg-install.in-# that is distributed with the PyPI tarball,
build/pkgs/terminado/spkg-install.in-# so we do not have to have flit.  Trac #29803.
build/pkgs/terminado/spkg-install.in:rm -f pyproject.toml
--

flit_core is added in #31280, poetry_core in #33866, so we can make use of these build systems instead of relying on generated setup scripts.

Depends on #33530
Depends on #33789

Component: build

Author: Matthias Koeppe

Branch/Commit: 1079cd4

Reviewer: John Palmieri

Issue created by migration from https://trac.sagemath.org/ticket/32483

@mkoeppe mkoeppe added this to the sage-9.5 milestone Sep 6, 2021
@mkoeppe mkoeppe changed the title Add flit_core, poetry_core packages, remove workarounds for packages that uses them Add flit_core, poetry_core packages, remove workarounds for packages that use them Sep 6, 2021
@mkoeppe mkoeppe modified the milestones: sage-9.5, sage-9.6 Dec 14, 2021
@mkoeppe mkoeppe modified the milestones: sage-9.6, sage-9.7 Mar 5, 2022
@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 4, 2022

Dependencies: #33530

@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 4, 2022

Changed dependencies from #33530 to #33530, #33789

@mkoeppe

This comment has been minimized.

@mkoeppe mkoeppe changed the title Add flit_core, poetry_core packages, remove workarounds for packages that use them Remove workarounds for packages that use flit_core or poetry_core as build system Jul 4, 2022
@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 4, 2022

@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 4, 2022

Commit: bb70ca3

@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 4, 2022

Author: Matthias Koeppe

@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 4, 2022

Last 10 new commits:

254694cMerge #33866
2a7342fsrc/sage/repl/display/jsmol_iframe.py: Update extension name following version 2022.1.0
b38b8d4Merge #33530
ac61e28build/pkgs/terminado: Update; do not remove pyproject.toml
738ab26build/bin/sage-dist-helpers (sdh_pip_install): Change default to --build-isolation
79c6002build/bin/sage-dist-helpers (sdh_pip_install): Fall back to --no-build-isolation on error
f6ba526build/pkgs/tomli/spkg-install.in: Build it with --no-build-isolation
1be87e1Merge #33789
7dbd5b5build/pkgs/terminado: Fix dependencies
bb70ca3build/pkgs/pkgconfig: Do not remove pyproject.toml, add poetry_core as a dependency

@mkoeppe

This comment has been minimized.

@mkoeppe mkoeppe modified the milestones: sage-9.7, sage-9.8 Aug 31, 2022
@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Sep 24, 2022

Changed commit from bb70ca3 to 3f8e3dc

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Sep 24, 2022

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

a3eb4cabuild/pkgs/terminado: Update; do not remove pyproject.toml
0624430build/pkgs/terminado: Fix dependencies
1079cd4build/pkgs/pkgconfig: Do not remove pyproject.toml, add poetry_core as a dependency
3f8e3dcbuild/pkgs/poetry_core: Update to 1.2.0

@mkoeppe mkoeppe changed the title Remove workarounds for packages that use flit_core or poetry_core as build system Remove workarounds for packages that use flit_core or poetry_core as build system, update poetry_core to 1.2.0 Sep 24, 2022
@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Sep 24, 2022

Changed commit from 3f8e3dc to 1079cd4

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Sep 24, 2022

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

@mkoeppe mkoeppe changed the title Remove workarounds for packages that use flit_core or poetry_core as build system, update poetry_core to 1.2.0 Remove workarounds for packages that use flit_core or poetry_core as build system Sep 24, 2022
@jhpalmieri
Copy link
Member

comment:15

It works, but I'm confused by terminado: how did you know to make hatchling a dependency? I don't see any reference to flit or hatchling in the terminado tarball — grep flit -R . comes up empty, for example — and it only lists ptyprocess and tornado as requirements.

@jhpalmieri
Copy link
Member

comment:16

Never mind, I was looking at the old tarball. I see hatchling in the new one.

@jhpalmieri
Copy link
Member

Reviewer: John Palmieri

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 28, 2022

comment:17

Thanks! Yes, the build system changed in the update.

@vbraun
Copy link
Member

vbraun commented Sep 29, 2022

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants