[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Thu Dec 8 17:59:03 MST 2011


The branch, master has been updated
       via  85f8d97 Revert "Install (platform-independent) python scripts to the PYTHONDIR rather than PYTHONARCHDIR."
       via  0e9b092 Add 'make pep8' target.
      from  31eba61 Add test for PEP8 - currently all errors are ignored, but we warn about them - and can ratchet if we want to.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 85f8d97f5121b239ebe814a8ef6765317ddd3f51
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Dec 8 23:46:14 2011 +0100

    Revert "Install (platform-independent) python scripts to the PYTHONDIR rather than PYTHONARCHDIR."
    
    This reverts commit de4b8943bfb40e2f50c9e4e2ee5d39e986317d08.
    
    PYTHONDIR and PYTHONARCHDIR are both incorrect - they're the
    distribution's python locations, rather than the python locations for
    third party applications. For the moment, using PYTHONARCHDIR seems
    better though, because it works around an issue on Fedora/RedHat.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Fri Dec  9 01:58:50 CET 2011 on sn-devel-104

commit 0e9b092531247ea00840d97b4d96fbfd0395c179
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Dec 8 22:14:55 2011 +0100

    Add 'make pep8' target.

-----------------------------------------------------------------------

Summary of changes:
 Makefile                               |    3 +++
 source4/scripting/python/wscript_build |    2 +-
 wscript                                |    8 ++++++++
 3 files changed, 12 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile b/Makefile
index 3b40c73..ae2fc06 100644
--- a/Makefile
+++ b/Makefile
@@ -73,3 +73,6 @@ FORCE:
 
 pydoctor:
 	$(WAF) pydoctor
+
+pep8:
+	$(WAF) pep8
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 73f7ae8..8879f75 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -36,4 +36,4 @@ bld.SAMBA_SCRIPT('samba_python',
                  pattern='samba/**/*.py',
                  installdir='python')
 
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)
diff --git a/wscript b/wscript
index 5ccb74d..18daaac 100755
--- a/wscript
+++ b/wscript
@@ -152,6 +152,14 @@ def pydoctor(ctx):
     print("Running: %s" % cmd)
     os.system(cmd)
 
+
+def pep8(ctx):
+    '''run pep8 validator'''
+    cmd='PYTHONPATH=bin/python pep8 -r bin/python/samba'
+    print("Running: %s" % cmd)
+    os.system(cmd)
+
+
 def wafdocs(ctx):
     '''build wafsamba apidocs'''
     from samba_utils import recursive_dirlist


-- 
Samba Shared Repository


More information about the samba-cvs mailing list