# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1469030329 -7200
# Node ID f666f484e5f45e2c6361bff8ecbac97328a4d97a
# Parent  740cc1e09322c13c6a820dfd1d8ff58ae11c45f1# Parent  aaa768e886ae958695ab773ac08a16923760d0c1
merge 3.23

diff -r 740cc1e09322 -r f666f484e5f4 MANIFEST.in
--- a/MANIFEST.in	Fri Jul 08 13:40:50 2016 +0200
+++ b/MANIFEST.in	Wed Jul 20 17:58:49 2016 +0200
@@ -2,6 +2,7 @@
 include COPYING
 include COPYING.LESSER
 include pylintrc
+include tox.ini
 include bin/cubicweb-*
 include man/cubicweb-ctl.1
 
@@ -41,7 +42,7 @@
 recursive-include cubicweb/web/test/jstests *.js *.html *.css *.json
 recursive-include cubicweb/web/test/windmill *.py
 
-recursive-include cubicweb/skeleton *.py *.css *.js *.po compat *.in *.tmpl rules
+recursive-include cubicweb/skeleton *.py *.css *.js *.po compat *.in *.tmpl rules tox.ini
 
 prune doc/book/en/.static
 prune doc/book/fr/.static
diff -r 740cc1e09322 -r f666f484e5f4 cubicweb.spec
diff -r 740cc1e09322 -r f666f484e5f4 cubicweb/__pkginfo__.py
diff -r 740cc1e09322 -r f666f484e5f4 cubicweb/devtools/test/unittest_devctl.py
--- a/cubicweb/devtools/test/unittest_devctl.py	Fri Jul 08 13:40:50 2016 +0200
+++ b/cubicweb/devtools/test/unittest_devctl.py	Wed Jul 20 17:58:49 2016 +0200
@@ -27,8 +27,7 @@
 
 
 def newcube(directory, name):
-    cmd = [sys.executable, '-m' 'cubicweb', 'newcube',
-           '--directory', directory, name]
+    cmd = ['cubicweb-ctl', 'newcube', '--directory', directory, name]
     proc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=STDOUT)
     stdout, _ = proc.communicate(b'short_desc\n')
     return proc.returncode, stdout
diff -r 740cc1e09322 -r f666f484e5f4 debian/changelog
diff -r 740cc1e09322 -r f666f484e5f4 debian/cubicweb-dev.lintian-overrides
--- a/debian/cubicweb-dev.lintian-overrides	Fri Jul 08 13:40:50 2016 +0200
+++ b/debian/cubicweb-dev.lintian-overrides	Wed Jul 20 17:58:49 2016 +0200
@@ -1,1 +1,1 @@
-missing-dep-for-interpreter make => make | build-essential | dpkg-dev (usr/*/cubicweb/skeleton/debian/rules.tmpl)
+missing-dep-for-interpreter make => make | build-essential | dpkg-dev (usr/*/cubicweb/skeleton/debian/rules)
diff -r 740cc1e09322 -r f666f484e5f4 setup.py
--- a/setup.py	Fri Jul 08 13:40:50 2016 +0200
+++ b/setup.py	Wed Jul 20 17:58:49 2016 +0200
@@ -107,15 +107,24 @@
         import errno
         if ex.errno != errno.EEXIST:
             raise
+    else:
+        if verbose:
+            print('created %s directory' % to_dir)
     for dirpath, dirnames, filenames in os.walk(from_dir):
         for norecurs in blacklist:
             try:
                 dirnames.remove(norecurs)
             except ValueError:
                 pass
+            else:
+                if verbose:
+                    print('not recursing in %s' % join(dirpath, norecurs))
         for dirname in dirnames:
-            dest = join(to_dir, dirname)
+            src = join(dirpath, dirname)
+            dest = to_dir + src[len(from_dir):]
             if not exists(dest):
+                if verbose:
+                    print('creating %s directory' % dest)
                 os.mkdir(dest)
         for filename in filenames:
             # don't include binary files
@@ -127,11 +136,11 @@
                 continue
             if exists(dest):
                 os.remove(dest)
+            if verbose:
+                print('copying %s to %s' % (src, dest))
             shutil.copy2(src, dest)
 
 
-EMPTY_FILE = '"""generated file, don\'t modify or your data will be lost"""\n'
-
 class MyInstallLib(install_lib.install_lib):
     """extend install_lib command to handle  package __init__.py and
     include_dirs variable if necessary
@@ -143,8 +152,9 @@
         # manually install included directories if any
         if include_dirs:
             for directory in include_dirs:
-                dest = join(self.install_dir, modname, directory)
-                export(directory, dest, verbose=False)
+                src = join(modname, directory)
+                dest = join(self.install_dir, src)
+                export(src, dest, verbose=self.verbose)
 
 # write required share/cubicweb/cubes/__init__.py
 class MyInstallData(install_data.install_data):
diff -r 740cc1e09322 -r f666f484e5f4 tox.ini
--- a/tox.ini	Fri Jul 08 13:40:50 2016 +0200
+++ b/tox.ini	Wed Jul 20 17:58:49 2016 +0200
@@ -4,13 +4,11 @@
   py34-{cubicweb,dataimport,devtools,entities,ext,hooks,server,migractions,sobjects,web,wsgi}
 
 [testenv]
-usedevelop = True
 sitepackages = True
 whitelist_externals =
   /usr/bin/touch
 deps =
   -rdev-requirements.txt
-  py34: -e.
   cubicweb: -r{toxinidir}/cubicweb/test/requirements.txt
   devtools: -r{toxinidir}/cubicweb/devtools/test/requirements.txt
   entities: -r{toxinidir}/cubicweb/entities/test/requirements.txt