[Git][debian-gis-team/pydecorate][master] Do not use setuptools-scm

[Antonio Valentino]

Antonio Valentino pushed to branch master at Debian GIS Project / pydecorate


Commits:
8c0e1b88 by Antonio Valentino at 2020-04-12T14:48:10+00:00
Do not use setuptools-scm

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0001-No-setuptools_scm.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -11,12 +11,13 @@ pydecorate (0.3.1-1) unstable; urgency=medium
   * Set debhelper-compat version in Build-Depends.
   * Explicitly set Rules-Requires-Root: no
   * debian/control
-    - update build dependencies: drop mack, add setuptools-scm
-      and setuptools-scm-git-archive
+    - update build dependencies (drop mack)
   * debian/rules:
     - improve clean target (also revove pydecorate/version.py)
+  * debian/parches:
+    - new 0001-No-setuptools_scm.patch
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 12 Apr 2020 07:40:52 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 12 Apr 2020 14:47:11 +0000
 
 pydecorate (0.2.1-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -14,8 +14,6 @@ Build-Depends: debhelper-compat (= 12),
                python3-pil,
                python3-pytest,
                python3-setuptools,
-               python3-setuptools-scm,
-               python3-setuptools-scm-git-archive,
                python3-trollimage
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/pydecorate


=====================================
debian/patches/0001-No-setuptools_scm.patch
=====================================
@@ -0,0 +1,21 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 12 Apr 2020 14:45:03 +0000
+Subject: No setuptools_scm
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 6b754df..a30ed4b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -55,7 +55,7 @@ setup(name='pydecorate',
+       # Project should use reStructuredText, so ensure that the docutils get
+       # installed or upgraded on the target machine
+       install_requires=['pillow', 'aggdraw'],
+-      setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
++      # setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
+       scripts=[],
+       data_files=[],
+       # test_suite="",


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-No-setuptools_scm.patch


=====================================
debian/rules
=====================================
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/pkg-info.mk
+
 export PYBUILD_NAME=pydecorate
 export PYBUILD_TEST_ARGS=test.py
 export PYBUILD_BEFORE_TEST=cp {dir}/test.py {dir}/*.png {build_dir}
@@ -12,6 +14,10 @@ export PYBUILD_AFTER_TEST=rm -f {build_dir}/test.py {build_dir}/*.png
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
+override_dh_auto_configure:
+	echo "version = '$(DEB_VERSION_UPSTREAM)'" > pydecorate/version.py
+	dh_auto_configure
+
 override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) -r *.egg-info



View it on GitLab: https://salsa.debian.org/debian-gis-team/pydecorate/-/commit/8c0e1b887dff8fa5a74a9511c56021e6b48923ee

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pydecorate/-/commit/8c0e1b887dff8fa5a74a9511c56021e6b48923ee
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/20200412/cade968f/attachment-0001.html>