[med-svn] [Git][med-team/conda][master] 3 commits: Set CONDA_PKGS_DIRS for autopkgtest

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
9e70e76b by Andreas Tille at 2019-03-12T14:39:27Z
Set CONDA_PKGS_DIRS for autopkgtest

- - - - -
0e8c27ba by Andreas Tille at 2019-03-12T14:46:09Z
For some strange reason ruamel.yaml is named ruamel_yaml

- - - - -
c4df5a4b by Andreas Tille at 2019-03-12T14:47:24Z
Add missing Build-Depends: python3-pexpect, copy Build-Depends to Depends

- - - - -


4 changed files:

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


Changes:

=====================================
debian/control
=====================================
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 12~),
                python3,
                python3-setuptools,
                python3-pycosat,
+               python3-pexpect,
                python3-requests,
                python3-ruamel.yaml,
                python3-responses,
@@ -19,8 +20,13 @@ Homepage: https://conda.io/
 
 Package: conda
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${python3:Depends},
          ${misc:Depends}
+         python3-pycosat,
+         python3-pexpect,
+         python3-requests,
+         python3-ruamel.yaml,
+         python3-responses,
 Description: OS-agnostic, system-level binary package manager and ecosystem
  Conda is a cross-platform, language-agnostic binary package manager. It
  is the package manager used by Anaconda installations, but it may be


=====================================
debian/patches/ruamel_yaml_name.patch
=====================================
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 10 Mar 2019 09:33:50 +0100
+Description: For some strange reason ruamel.yaml is named ruamel_yaml
+ No idea under what circumstances this can work but in unstable pbuilder
+ it does not and it is fixed hereby
+
+--- a/tests/conda_env/test_env.py
++++ b/tests/conda_env/test_env.py
+@@ -10,7 +10,7 @@ from conda.base.context import reset_con
+ from conda.common.io import env_vars
+ from conda.common.serialize import yaml_load
+ from conda.install import on_win
+-import ruamel_yaml
++import ruamel.yaml
+ 
+ from . import support_file
+ from .utils import make_temp_envs_dir, Commands, run_command


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 do_not_use_git_in_configure.patch
 skip_tests_needing_conda-build.patch
+ruamel_yaml_name.patch


=====================================
debian/rules
=====================================
@@ -28,8 +28,7 @@ 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)))
-#	do_stuff_for_testing
-#endif
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	CONDA_PKGS_DIRS=/tmp/pkgs dh_auto_test
+endif



View it on GitLab: https://salsa.debian.org/med-team/conda/compare/a30434d1bb72943fadd2c5a570ef89fe0297cfb2...c4df5a4bf493f1648cd044dbfedaa64b0dacbc68

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/compare/a30434d1bb72943fadd2c5a570ef89fe0297cfb2...c4df5a4bf493f1648cd044dbfedaa64b0dacbc68
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/20190312/740d18e2/attachment-0001.html>