* [gentoo-commits] repo/gentoo:master commit in: dev-python/nbformat/, dev-python/nbformat/files/
@ 2021-01-22 9:55 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-01-22 9:55 UTC (permalink / raw
To: gentoo-commits
commit: a97111edf2940ad7d52b113afb79a69ed69dfdaa
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 09:34:37 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 09:55:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97111ed
dev-python/nbformat: Fix installing package data
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/nbformat-5.1.2-package-data.patch | 50 ++++++++++++++++++++++
...ormat-5.1.2.ebuild => nbformat-5.1.2-r1.ebuild} | 6 ++-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch
new file mode 100644
index 00000000000..4fd1de2a942
--- /dev/null
+++ b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch
@@ -0,0 +1,50 @@
+From 6dc17e79be58c3cce66256eec2a565692cf95809 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 22 Jan 2021 10:16:24 +0100
+Subject: [PATCH] Fix installing package_data when --build-base is set
+
+Fix package_data declarations in setup.py to associate every set
+of files with its bottommost package. This is necessary for the 'build'
+command to install files correctly when --build-base is passed
+explicitly. The all-files-for-top-package approach seems to work only
+incidentally.
+
+To reproduce the problem, try:
+
+ setup.py build --build-base=build2
+
+and note that none of the data files were installed.
+---
+ setup.py | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 22305d3..0a6aa45 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,11 +34,17 @@ for d, _, _ in os.walk(pjoin(here, name)):
+ packages.append(d[len(here)+1:].replace(os.path.sep, '.'))
+
+ package_data = {
+- 'nbformat' : [
+- 'corpus/*.txt'
+- 'tests/*.ipynb',
+- 'v3/nbformat.v3*.schema.json',
+- 'v4/nbformat.v4*.schema.json',
++ 'nbformat.corpus' : [
++ '*.txt',
++ ],
++ 'nbformat.tests' : [
++ '*.ipynb',
++ ],
++ 'nbformat.v3' : [
++ 'nbformat.v3*.schema.json',
++ ],
++ 'nbformat.v4' : [
++ 'nbformat.v4*.schema.json',
+ ],
+ }
+
+--
+2.30.0
+
diff --git a/dev-python/nbformat/nbformat-5.1.2.ebuild b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
similarity index 92%
rename from dev-python/nbformat/nbformat-5.1.2.ebuild
rename to dev-python/nbformat/nbformat-5.1.2-r1.ebuild
index 6991991c0a6..2444649ad3e 100644
--- a/dev-python/nbformat/nbformat-5.1.2.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
@@ -26,13 +26,17 @@ RDEPEND="
>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
dev-python/jupyter_core[${PYTHON_USEDEP}]
"
-DEPEND="
+BDEPEND="
test? (
dev-python/fastjsonschema[${PYTHON_USEDEP}]
dev-python/testpath[${PYTHON_USEDEP}]
)
"
+PATCHES=(
+ "${FILESDIR}"/nbformat-5.1.2-package-data.patch
+)
+
distutils_enable_sphinx docs \
dev-python/numpydoc
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/nbformat/, dev-python/nbformat/files/
@ 2022-12-20 20:03 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-12-20 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 2d31c74f929dad89471fa02d043456934c01ee03
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 19:52:15 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 20:02:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d31c74f
dev-python/nbformat: add 5.7.1
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/nbformat/Manifest | 1 +
.../nbformat/files/nbformat-5.7.1-no-node.patch | 27 +++++++++++++
dev-python/nbformat/nbformat-5.7.1.ebuild | 47 ++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index e50566c9192b..a6975294fa3b 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1 +1,2 @@
DIST nbformat-5.4.0.gh.tar.gz 134574 BLAKE2B f61275ad501381f05dc22a79f24c175fa71610f09cf125a40aaa90d0e02d3b27d82d918c1036b0516d4f879609f65c1ce62de86b033012e25d353af453828b2e SHA512 f601438193bfcb11f1ceed74995ab6862ff8c916f9bddabe38fd70bb997f4407bede4318ae7034d75424b20b75846010ddda2a45b8fe8de6dd9310617b00fb9d
+DIST nbformat-5.7.1.tar.gz 139291 BLAKE2B 680952ef35235021b36357babd98c94656d96888e1e5e01ecf35ce3233d51f751a60c964f0675fbad18242db8a1adb9fce2bbc512cefc4e30c254492584956c3 SHA512 248640ee23aae83c9c2b18502369d99c317447d40e5b3dc790260d21eda8ef027a7eca9ded34b98c7b17be7fe4b4401c556dbb9d4b0be80d4e4bff10a17381ce
diff --git a/dev-python/nbformat/files/nbformat-5.7.1-no-node.patch b/dev-python/nbformat/files/nbformat-5.7.1-no-node.patch
new file mode 100644
index 000000000000..e88cc8cdd522
--- /dev/null
+++ b/dev-python/nbformat/files/nbformat-5.7.1-no-node.patch
@@ -0,0 +1,27 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index e30d156..97e57de 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,10 +1,10 @@
+ [build-system]
+-requires = ["hatchling>=1.5", "hatch-nodejs-version"]
++requires = ["hatchling>=1.5"]
+ build-backend = "hatchling.build"
+
+ [project]
+ name = "nbformat"
+-dynamic = ["version"]
++version = "5.7.1"
+ description = "The Jupyter Notebook format"
+ license = { file = "COPYING.md" }
+ keywords = ["Interactive", "Interpreter", "Shell", "Web"]
+@@ -58,9 +58,6 @@ test = [
+ [project.scripts]
+ jupyter-trust = "nbformat.sign:TrustNotebookApp.launch_instance"
+
+-[tool.hatch.version]
+-source = "nodejs"
+-
+ [tool.hatch.envs.docs]
+ features = ["docs"]
+ [tool.hatch.envs.docs.scripts]
diff --git a/dev-python/nbformat/nbformat-5.7.1.ebuild b/dev-python/nbformat/nbformat-5.7.1.ebuild
new file mode 100644
index 000000000000..2aea4d3d8c3f
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.7.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="
+ https://jupyter.org/
+ https://github.com/jupyter/nbformat/
+ https://pypi.org/project/nbformat/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/fastjsonschema[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/testpath[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs \
+ dev-python/numpydoc
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-node.patch"
+)
+
+EPYTEST_IGNORE=(
+ # requires pep440 package, which is not really relevant for us
+ tests/test_api.py
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/nbformat/, dev-python/nbformat/files/
@ 2024-10-30 15:19 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-10-30 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 14e8dcfcd00aea393167a522f38da5cd19ec6c35
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 15:16:57 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 15:19:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e8dcfc
dev-python/nbformat: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/nbformat/Manifest | 1 -
.../nbformat/files/nbformat-5.7.1-no-node.patch | 27 ------------
dev-python/nbformat/nbformat-5.10.3-r1.ebuild | 49 ----------------------
dev-python/nbformat/nbformat-5.10.3-r2.ebuild | 46 --------------------
4 files changed, 123 deletions(-)
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 801b196148ab..fca7a424a634 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,2 +1 @@
-DIST nbformat-5.10.3.tar.gz 142678 BLAKE2B 7de9dab29ca69fe89fb8c080f1e336a22acdc7d9a0daaf69dd03c61f7a01853895bd2302ee90787c3a7a555a27cf5cc1bab6ca0c898c60326ff3870820a00fbe SHA512 9baed15fed4bf05c2c97f7634ce1440149bf5e44a7fd330aa40f7c3954a6f16fc755e1d643a01a4d9ee62fb7a0f24299b83d9a4cf753e7c3495319ee052ae5e8
DIST nbformat-5.10.4.tar.gz 142749 BLAKE2B 88121046cce0e473597f26cb597b3ae9865849cf05bcb64070b48d8bcf3661a6c7b7b7e6845752ca1467e31dd9da939f208e99f51b873ea12e62b3a605bf375b SHA512 cacec6bca3177958863e7ed860c55498a91507634098adc08b49a3bb43f1158a32b0c029262d44d0f1beb1e795ba7d03753b522120a9aec14514ed8d961d5baa
diff --git a/dev-python/nbformat/files/nbformat-5.7.1-no-node.patch b/dev-python/nbformat/files/nbformat-5.7.1-no-node.patch
deleted file mode 100644
index dc2bfb7c0ab7..000000000000
--- a/dev-python/nbformat/files/nbformat-5.7.1-no-node.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index e30d156..97e57de 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,10 +1,10 @@
- [build-system]
--requires = ["hatchling>=1.5", "hatch-nodejs-version"]
-+requires = ["hatchling>=1.5"]
- build-backend = "hatchling.build"
-
- [project]
- name = "nbformat"
--dynamic = ["version"]
-+version = "5.10.3"
- description = "The Jupyter Notebook format"
- license = { file = "COPYING.md" }
- keywords = ["Interactive", "Interpreter", "Shell", "Web"]
-@@ -58,9 +58,6 @@ test = [
- [project.scripts]
- jupyter-trust = "nbformat.sign:TrustNotebookApp.launch_instance"
-
--[tool.hatch.version]
--source = "nodejs"
--
- [tool.hatch.envs.docs]
- features = ["docs"]
- [tool.hatch.envs.docs.scripts]
diff --git a/dev-python/nbformat/nbformat-5.10.3-r1.ebuild b/dev-python/nbformat/nbformat-5.10.3-r1.ebuild
deleted file mode 100644
index 8f22f3a6b876..000000000000
--- a/dev-python/nbformat/nbformat-5.10.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="
- https://jupyter.org/
- https://github.com/jupyter/nbformat/
- https://pypi.org/project/nbformat/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
- dev-python/fastjsonschema[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
- >=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
- dev-python/jupyter-core[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/testpath[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs \
- dev-python/myst-parser \
- dev-python/pydata-sphinx-theme \
- dev-python/sphinxcontrib-github-alt \
- dev-python/sphinxcontrib-spelling
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}/nbformat-5.7.1-no-node.patch"
-)
-
-EPYTEST_IGNORE=(
- # requires pep440 package, which is not really relevant for us
- tests/test_api.py
-)
diff --git a/dev-python/nbformat/nbformat-5.10.3-r2.ebuild b/dev-python/nbformat/nbformat-5.10.3-r2.ebuild
deleted file mode 100644
index 3db00dcb7bc3..000000000000
--- a/dev-python/nbformat/nbformat-5.10.3-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="
- https://jupyter.org/
- https://github.com/jupyter/nbformat/
- https://pypi.org/project/nbformat/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- dev-python/fastjsonschema[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
- >=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
- dev-python/jupyter-core[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/hatch-nodejs-version[${PYTHON_USEDEP}]
- test? (
- dev-python/testpath[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs \
- dev-python/myst-parser \
- dev-python/pydata-sphinx-theme \
- dev-python/sphinxcontrib-github-alt \
- dev-python/sphinxcontrib-spelling
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
- # requires pep440 package, which is not really relevant for us
- tests/test_api.py
-)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-30 15:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-22 9:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/nbformat/, dev-python/nbformat/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-12-20 20:03 Andrew Ammerlaan
2024-10-30 15:19 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox