[Git][debian-gis-team/satpy][master] Drop 0002-No-setuptools-scm.patch
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Mon Aug 14 09:45:36 BST 2023
Antonio Valentino pushed to branch master at Debian GIS Project / satpy
Commits:
6ab1f1fd by Antonio Valentino at 2023-08-14T08:26:55+00:00
Drop 0002-No-setuptools-scm.patch
- - - - -
10 changed files:
- debian/control
- − debian/patches/0002-No-setuptools-scm.patch
- debian/patches/0003-Skip-broken-tests.patch → debian/patches/0002-Skip-broken-tests.patch
- debian/patches/0004-Use-local-mathjax.patch → debian/patches/0003-Use-local-mathjax.patch
- debian/patches/0005-Fix-broken-test-in-i386.patch → debian/patches/0004-Fix-broken-test-in-i386.patch
- debian/patches/0006-Relax-test-tolerance.patch → debian/patches/0005-Relax-test-tolerance.patch
- debian/patches/0007-Fix-privacy-breach.patch → debian/patches/0006-Fix-privacy-breach.patch
- debian/patches/0008-Fix-compatibility-with-old-dask-versions.patch → debian/patches/0007-Fix-compatibility-with-old-dask-versions.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -53,6 +53,7 @@ Build-Depends: debhelper-compat (= 13),
python3-scipy,
python3-setuptools,
python3-setuptools-scm,
+ python3-setuptools-scm-git-archive,
python3-skyfield,
python3-sphinx <!nodoc>,
python3-sphinx-rtd-theme <!nodoc>,
=====================================
debian/patches/0002-No-setuptools-scm.patch deleted
=====================================
@@ -1,112 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Wed, 1 Jan 2020 11:24:15 +0000
-Subject: No setuptools-scm
-
-Forwarded: non-needed
----
- doc/source/conf.py | 16 +++++++++++-----
- pyproject.toml | 7 ++++---
- setup.cfg | 8 ++++----
- setup.py | 19 ++++++++++++-------
- 4 files changed, 31 insertions(+), 19 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 4af8d63..5721a47 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -32,11 +32,17 @@ from reader_table import generate_reader_table # noqa: E402
- # |version| and |release|, also used in various other places throughout the
- # built documents.
- #
--# get version using setuptools-scm
--release = get_distribution('satpy').version
--# The full version, including alpha/beta/rc tags.
--# for example take major/minor
--version = '.'.join(release.split('.')[:2])
-+try:
-+ # get version using setuptools-scm
-+ release = get_distribution('satpy').version
-+ # The full version, including alpha/beta/rc tags.
-+ # for example take major/minor
-+ version = '.'.join(release.split('.')[:2])
-+except Exception:
-+ import re
-+ versionfile = '../../satpy/version.py'
-+ mobj = re.match('version = (?P<version>.+)', open(versionfile).read())
-+ version = mobj.group('version')
-
-
- class Mock(object): # noqa
-diff --git a/pyproject.toml b/pyproject.toml
-index e27dcfd..3a17a82 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,9 +1,10 @@
- [build-system]
--requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive']
-+# requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive']
-+requires = ["setuptools>=45", "wheel"]
- build-backend = "setuptools.build_meta"
-
--[tool.setuptools_scm]
--write_to = "satpy/version.py"
-+# [tool.setuptools_scm]
-+# write_to = "satpy/version.py"
-
- [tool.isort]
- sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
-diff --git a/setup.cfg b/setup.cfg
-index e2ef375..38f6f5b 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,7 +1,7 @@
--[options]
--setup_requires =
-- setuptools_scm
-- setuptools_scm_git_archive
-+# [options]
-+# setup_requires =
-+# setuptools_scm
-+# setuptools_scm_git_archive
-
- [bdist_rpm]
- requires=h5py pyresample python2-numexpr pyhdf xarray dask h5netcdf
-diff --git a/setup.py b/setup.py
-index 75885dc..8844095 100644
---- a/setup.py
-+++ b/setup.py
-@@ -22,13 +22,13 @@ from glob import glob
-
- from setuptools import find_packages, setup
-
--try:
-- # HACK: https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286
-- # Stop setuptools_scm from including all repository files
-- import setuptools_scm.integration
-- setuptools_scm.integration.find_files = lambda _: []
--except ImportError:
-- pass
-+# try:
-+# # HACK: https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286
-+# # Stop setuptools_scm from including all repository files
-+# import setuptools_scm.integration
-+# setuptools_scm.integration.find_files = lambda _: []
-+# except ImportError:
-+# pass
-
- requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.24.0', 'trollsift',
- 'trollimage >=1.20', 'pykdtree', 'pyyaml >=5.1', 'xarray >=0.10.1, !=0.13.0',
-@@ -127,8 +127,13 @@ entry_points = {
- NAME = 'satpy'
- with open('README.rst', 'r') as readme:
- README = readme.read()
-+try:
-+ from satpy import __version__ as VERSION
-+except ImportError:
-+ VERSION = '0.0.0'
-
- setup(name=NAME,
-+ version=VERSION,
- description='Python package for earth-observing satellite data processing',
- long_description=README,
- author='The Pytroll Team',
=====================================
debian/patches/0003-Skip-broken-tests.patch → debian/patches/0002-Skip-broken-tests.patch
=====================================
=====================================
debian/patches/0004-Use-local-mathjax.patch → debian/patches/0003-Use-local-mathjax.patch
=====================================
@@ -8,10 +8,10 @@ Forwarded: not-needed
1 file changed, 2 insertions(+)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 5721a47..e2a06b2 100644
+index 4af8d63..10bc84b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -302,3 +302,5 @@ intersphinx_mapping = {
+@@ -296,3 +296,5 @@ intersphinx_mapping = {
'pooch': ('https://www.fatiando.org/pooch/latest/', None),
'fsspec': ('https://filesystem-spec.readthedocs.io/en/latest/', None),
}
=====================================
debian/patches/0005-Fix-broken-test-in-i386.patch → debian/patches/0004-Fix-broken-test-in-i386.patch
=====================================
=====================================
debian/patches/0006-Relax-test-tolerance.patch → debian/patches/0005-Relax-test-tolerance.patch
=====================================
=====================================
debian/patches/0007-Fix-privacy-breach.patch → debian/patches/0006-Fix-privacy-breach.patch
=====================================
@@ -9,10 +9,10 @@ Forwarded: not-needed
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index e2a06b2..ccb47d9 100644
+index 10bc84b..23de217 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -200,11 +200,11 @@ html_static_path = ['_static']
+@@ -194,11 +194,11 @@ html_static_path = ['_static']
html_css_files = [
'theme_overrides.css', # override wide tables in RTD theme
=====================================
debian/patches/0008-Fix-compatibility-with-old-dask-versions.patch → debian/patches/0007-Fix-compatibility-with-old-dask-versions.patch
=====================================
=====================================
debian/patches/series
=====================================
@@ -1,8 +1,7 @@
0001-Disable-extra-dependency-form-geoviews.patch
-0002-No-setuptools-scm.patch
-0003-Skip-broken-tests.patch
-0004-Use-local-mathjax.patch
-0005-Fix-broken-test-in-i386.patch
-0006-Relax-test-tolerance.patch
-0007-Fix-privacy-breach.patch
-0008-Fix-compatibility-with-old-dask-versions.patch
+0002-Skip-broken-tests.patch
+0003-Use-local-mathjax.patch
+0004-Fix-broken-test-in-i386.patch
+0005-Relax-test-tolerance.patch
+0006-Fix-privacy-breach.patch
+0007-Fix-compatibility-with-old-dask-versions.patch
=====================================
debian/rules
=====================================
@@ -48,7 +48,8 @@ execute_after_dh_auto_build-indep: export https_proxy=127.0.0.1:9
execute_after_dh_auto_build-indep:
ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
PSP_CONFIG_FILE=$(CURDIR)/debian/pyspectral_dummycfg.yaml \
- PYTHONPATH=. python3 -m sphinx -N -E -T -b html doc/source $(CURDIR)/.pybuild/docs/html
+ PYTHONPATH={build_dir} \
+ python3 -m sphinx -N -E -T -b html doc/source $(CURDIR)/.pybuild/docs/html
endif
execute_after_dh_fixperms:
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/commit/6ab1f1fdf5aa59388cca468a63bc9f92868c9bfe
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/commit/6ab1f1fdf5aa59388cca468a63bc9f92868c9bfe
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/pkg-grass-devel/attachments/20230814/5f25f890/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list