-
-
Notifications
You must be signed in to change notification settings - Fork 679
Yet more spkg_configure for standard python packages #36276
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
Changes from all commits
1ee53b6
6462f07
ccd5629
5e0f997
468b87d
28cf8d9
264085e
62164e3
ca3d95b
2edd973
c3521b9
5b23bf6
fb5c951
c59c407
3ad8227
a1b6e72
01ff39e
7fda18c
4ece267
1571d28
68dc2d8
94b3aec
77aa9f1
beb94bc
a3cade0
fe68ca2
1a187e0
4df7474
c2f6558
6d0613b
f32bfeb
c5747b9
80fd0a9
0df84e1
b7c6367
f0e6420
d002b3f
45ee925
fb2752a
7d4345b
e5ac3c8
92a2189
180e814
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py3-beautifulsoup4 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-beautifulsoup4 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| beautifulsoup4 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-beautifulsoup4 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/beautifulsoup4 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-beautifulsoup4 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| SAGE_SPKG_CONFIGURE([beautifulsoup4], [SAGE_PYTHON_PACKAGE_CHECK([beautifulsoup4])]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-sphinx-furo |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| furo |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-furo |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| textproc/py-furo |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/furo |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([furo], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([furo]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| tarball=ipympl-VERSION-py2.py3-none-any.whl | ||
| sha1=9848409026669d9edd83074730d7e2456ae8a187 | ||
| md5=e08ec29d29955174178b7230d41a7ff7 | ||
| cksum=490103438 | ||
| upstream_url=https://pypi.io/packages/py2.py3/i/ipympl/ipympl-VERSION-py2.py3-none-any.whl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN) jupyter_packaging $(PYTHON) | ||
| ipython numpy ipython_genutils pillow traitlets ipywidgets matplotlib | $(PYTHON_TOOLCHAIN) $(PYTHON) | ||
|
|
||
| ---------- | ||
| All lines of this file are ignored except the first. | ||
|
|
||
| jupyterlab is listed as a "build-system requires", but the package installs correctly without it. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-ipympl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| devel/py-ipympl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py-ipympl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python:ipympl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 0.9.3 |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([ipympl], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([ipympl]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| jupyter-jsmol |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| science/py-jupyter_jsmol |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([jupyter_jsmol], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([jupyter_jsmol]) | ||
| ]) |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-jupyter-sphinx |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-jupyter-sphinx |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| textproc/py-jupyter_sphinx |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py-jupyter_sphinx |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-jupyter-sphinx |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([jupyter_sphinx], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([jupyter_sphinx]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([jupyterlab_widgets], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([jupyterlab_widgets]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py3-meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| devel/meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python3-meson-python |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([meson_python], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([meson-python]) | ||
| SAGE_PYTHON_PACKAGE_CHECK([meson_python]) | ||
| ]) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| tarball=pkgconfig-VERSION.tar.gz | ||
| sha1=32af6abc220c64b36f745a208b950542b1ab3456 | ||
| md5=12523e11b91b050ca49975cc033689a4 | ||
| cksum=1707388199 | ||
| upstream_url=https://pypi.io/packages/source/p/pkgconfig/pkgconfig-VERSION.tar.gz | ||
| tarball=pkgconfig-VERSION-py3-none-any.whl | ||
| sha1=bca14b2806a8e8afb0bd04f8e3675550b286dda8 | ||
| md5=80f1e06563f3af0f090694db58736455 | ||
| cksum=15738577 | ||
| upstream_url=https://pypi.io/packages/py3/p/pkgconfig/pkgconfig-VERSION-py3-none-any.whl |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| | $(PYTHON_TOOLCHAIN) pkgconf poetry_core $(PYTHON) | ||
| | pkgconf $(PYTHON_TOOLCHAIN) $(PYTHON) | ||
|
|
||
| ---------- | ||
| All lines of this file are ignored except the first. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| pkgconfig >=1.5.1 | ||
| pkgconfig |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/py |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py3-setuptools-scm-git-archive |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-setuptools-scm-git-archive |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| setuptools-scm-git-archive |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-setuptools_scm_git_archive |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| devel/py-setuptools_scm_git_archive |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/setuptools_scm_git_archive |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| SAGE_SPKG_CONFIGURE([setuptools_scm_git_archive], [SAGE_PYTHON_PACKAGE_CHECK([setuptools_scm_git_archive])]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| SAGE_SPKG_CONFIGURE([setuptools_wheel], [SAGE_PYTHON_PACKAGE_CHECK([setuptools_wheel])]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([sphinx], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([sphinx]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-sphinx-basic-ng |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sphinx-basic-ng |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-sphinx-basic-ng |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| textproc/py-sphinx-basic-ng |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/sphinx-basic-ng |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([sphinx_basic_ng], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([sphinx_basic_ng]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py3-sphinx-copybutton |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-sphinx-copybutton |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-sphinx-copybutton |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| textproc/py-sphinx-copybutton |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/sphinx-copybutton |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python3-sphinx-copybutton |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([sphinx_copybutton], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([sphinx_copybutton]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py3-sphinxcontrib-websupport |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sphinxcontrib-websupport |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/sphinxcontrib-websupport |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([sphinxcontrib_websupport], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_websupport]) | ||
| ]) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py3-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| textproc/py-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dev-python/tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| py-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python3-tinycss2 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SAGE_SPKG_CONFIGURE([tinycss2], [ | ||
| SAGE_PYTHON_PACKAGE_CHECK([tinycss2]) | ||
| ]) |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did this cause a problem? I recall making the inverse change but not the reason why. The argument to
SAGE_PYTHON_PACKAGE_CHECKshould be the name of the python package (not the sage package), although both names seem to work when passed topkg_resources.require(). In that regardmeson-pythonmore closely matches what's in e.g.install-requires.txtThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dashes don't work as part of environment variable names - see https://groups.google.com/g/sage-release/c/1wOBmhvNJqc/m/8IDtj6Y4BQAJ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
on the Python side, dashes and underscores in distribution names are interchangeable and get normalized as needed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, it still works for me with the underscore FWIW.