[med-svn] [Git][med-team/nitime][master] 7 commits: d/control: build depends on python3-setuptools-scm.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Thu Dec 14 21:52:51 GMT 2023
Étienne Mollier pushed to branch master at Debian Med / nitime
Commits:
71f3ee0e by Étienne Mollier at 2023-12-14T21:35:29+01:00
d/control: build depends on python3-setuptools-scm.
- - - - -
8b319c46 by Étienne Mollier at 2023-12-14T22:03:36+01:00
sphinx-conf-fix.patch: new: fix conf.py.
This is necessary as doc/conf.py still relies on the old
nitime/version.py, which has been replaced by nitime/_version.py,
causing various issues when trying to build python-nitime-doc.
- - - - -
123f3249 by Étienne Mollier at 2023-12-14T22:06:00+01:00
d/python-nitime-doc.lintian-overrides: refresh.
This fixes a mismatched override about embedded javascript.
- - - - -
6a101eda by Étienne Mollier at 2023-12-14T22:07:45+01:00
d/control: depend on pyproject backend.
- - - - -
b4354d2b by Étienne Mollier at 2023-12-14T22:50:59+01:00
demote-cython.patch: new: do not depend on cython3.
Closes: #1057996
- - - - -
7993b26b by Étienne Mollier at 2023-12-14T22:51:21+01:00
d/control: add myself to uploaders.
- - - - -
44079317 by Étienne Mollier at 2023-12-14T22:52:18+01:00
ready to uplaod to unstable.
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/demote-cython.patch
- debian/patches/series
- + debian/patches/sphinx-conf-fix.patch
- debian/python-nitime-doc.lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,23 @@
-nitime (0.10.2-1) UNRELEASED; urgency=medium
+nitime (0.10.2-1) unstable; urgency=medium
- * Team upload.
- * New upstream version
+ [ Andreas Tille ]
+ * New upstream version (Closes: #1058416)
* Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
* dh_clean needs more adjustments
- -- Andreas Tille <tille at debian.org> Mon, 11 Dec 2023 14:49:05 +0100
+ [ Étienne Mollier ]
+ * d/control: build depends on python3-setuptools-scm.
+ * sphinx-conf-fix.patch: new: fix conf.py.
+ This is necessary as doc/conf.py still relies on the old
+ nitime/version.py, which has been replaced by nitime/_version.py,
+ causing various issues when trying to build python-nitime-doc.
+ * d/python-nitime-doc.lintian-overrides: refresh.
+ This fixes a mismatched override about embedded javascript.
+ * d/control: depend on pyproject backend.
+ * demote-cython.patch: new: do not depend on cython3. (Closes: #1057996)
+ * d/control: add myself to uploaders.
+
+ -- Étienne Mollier <emollier at debian.org> Thu, 14 Dec 2023 22:51:37 +0100
nitime (0.10.1-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -2,13 +2,15 @@ Source: nitime
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Yaroslav Halchenko <debian at onerussian.com>,
Michael Hanke <mih at debian.org>,
- Nilesh Patra <nilesh at debian.org>
+ Nilesh Patra <nilesh at debian.org>,
+ Étienne Mollier <emollier at debian.org>
Section: python
Testsuite: autopkgtest-pkg-python
Priority: optional
Build-Depends: debhelper-compat (= 13),
python3-all,
dh-sequence-python3,
+ pybuild-plugin-pyproject,
python3-numpy,
python3-scipy,
python3-matplotlib,
@@ -17,6 +19,7 @@ Build-Depends: debhelper-compat (= 13),
python3-networkx,
python3-nibabel,
python3-setuptools,
+ python3-setuptools-scm,
python3-pytest,
graphviz
Standards-Version: 4.6.2
=====================================
debian/patches/demote-cython.patch
=====================================
@@ -0,0 +1,20 @@
+Description: demote cython requirement.
+ The dependency on cython3 is needed at build time, but there is no reason for
+ it to be required for end users of nitime at runtime.
+
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057996
+Forwarded: no
+Last-Update: 2023-12-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- nitime.orig/pyproject.toml
++++ nitime/pyproject.toml
+@@ -2,7 +2,6 @@
+ requires = [
+ "setuptools",
+ "setuptools_scm[toml]>=6.2",
+- "cython",
+ # As of numpy 1.25, you can now build against older APIs.
+ # https://numpy.org/doc/stable/release/1.25.0-notes.html
+ "numpy>=1.25; python_version > '3.8'",
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@ python3
sphinx_ignore_github.patch
numpydoc_1.24.patch
matplotlib.patch
+sphinx-conf-fix.patch
+demote-cython.patch
=====================================
debian/patches/sphinx-conf-fix.patch
=====================================
@@ -0,0 +1,28 @@
+Description: fix sphinx conf.py file.
+ Since introduction of nitime/_version.py through the move to pyproject.toml,
+ the sphinx documentation configuration script does not seem to have followed.
+ Use of the former variables are causing a variety of errors at documentation
+ build time.
+
+Author: Étienne Mollier <emollier at debian.org>
+Forwarded: https://github.com/nipy/nitime/pull/212
+Last-Update: 2023-12-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- nitime.orig/doc/conf.py
++++ nitime/doc/conf.py
+@@ -93,12 +93,12 @@
+ # We read the version info from the source file.
+ ver = {}
+
+-ver_file = os.path.join('..', 'nitime', 'version.py')
++ver_file = os.path.join('..', 'nitime', '_version.py')
+ with open(ver_file) as f:
+ exec(f.read())
+
+ # The short X.Y version.
+-version = '%s.%s' % (_version_major, _version_minor)
++version = '%s.%s' % (version_tuple[0], version_tuple[1])
+ # The full version, including alpha/beta/rc tags.
+ release = __version__
+
=====================================
debian/python-nitime-doc.lintian-overrides
=====================================
@@ -1,2 +1,2 @@
# False Positives
-python-nitime-doc: embedded-javascript-library usr/share/doc/python-nitime-doc/html/_static/*.js please use sphinx
+python-nitime-doc: embedded-javascript-library please use sphinx [usr/share/doc/python-nitime-doc/html/_static/*.js]
View it on GitLab: https://salsa.debian.org/med-team/nitime/-/compare/8adadceb1adc3abfb9b5599e3faf318f399615e3...44079317d6c26e906f47a008a6c6cf44dff9c45c
--
View it on GitLab: https://salsa.debian.org/med-team/nitime/-/compare/8adadceb1adc3abfb9b5599e3faf318f399615e3...44079317d6c26e906f47a008a6c6cf44dff9c45c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231214/17905ecc/attachment-0001.htm>
More information about the debian-med-commit
mailing list