[med-svn] [Git][med-team/conda][master] 2 commits: Try hard to get the .version file created

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
972a7be1 by Andreas Tille at 2019-03-10T17:25:17Z
Try hard to get the .version file created

- - - - -
bc9b9fd4 by Andreas Tille at 2019-03-10T17:38:42Z
Add pytest build-depends

- - - - -


4 changed files:

- debian/control
- + debian/patches/do_not_use_git_in_configure.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -8,7 +8,9 @@ Build-Depends: debhelper (>= 12~),
                python3,
                python3-setuptools,
                python3-pycosat,
-               python3-requests
+               python3-requests,
+               python3-ruamel.yaml,
+               python3-pytest
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/conda
 Vcs-Git: https://salsa.debian.org/med-team/conda.git


=====================================
debian/patches/do_not_use_git_in_configure.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/conda/_vendor/auxlib/packaging.py
++++ b/conda/_vendor/auxlib/packaging.py
+@@ -157,7 +157,7 @@ def get_version(dunder_file):
+     """
+     path = abspath(expanduser(dirname(dunder_file)))
+     try:
+-        return _get_version_from_version_file(path) or _get_version_from_git_tag(path)
++        return _get_version_from_version_file(path) # or _get_version_from_git_tag(path)
+     except CalledProcessError as e:
+         log.warn(repr(e))
+         return None


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+do_not_use_git_in_configure.patch


=====================================
debian/rules
=====================================
@@ -20,6 +20,14 @@ include /usr/share/dpkg/default.mk
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f conda/.version
+
+override_dh_auto_configure:
+	echo $(DEB_VERSION_UPSTREAM) > conda/.version
+	dh_auto_configure
+
 ### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
 #override_dh_auto_test:
 #ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))



View it on GitLab: https://salsa.debian.org/med-team/conda/compare/00baa3168b70589ecd5dcb5909c43a13e83ee54a...bc9b9fd4fc77fb146295034fe19c4a8e1adccbdc

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/compare/00baa3168b70589ecd5dcb5909c43a13e83ee54a...bc9b9fd4fc77fb146295034fe19c4a8e1adccbdc
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/20190310/55747254/attachment-0001.html>