openstack/deb-python-rjsmin
Code Issues Proposed changes

more svn->git transition

Browse Source
This commit is contained in:
ndparker 2013-10-13 18:25:28 +02:00
parent 06e2baf945
commit 53c9fa59cb
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pkg/pylint.conf
View File

@ -14,7 +14,7 @@ profile=no
# Add <file or directory> to the black list. It should be a base name, not a
# path. You may set this option multiple times.
ignore=
.svn, _tdi_impl.so
.git, .svn, _tdi_impl.so
# Pickle collected data for later comparisons.
persistent=no

2
_setup/py2/data.py
View File

@ -97,7 +97,7 @@ class Data(object):
result = []
for filename in files.files:
_, elems = splitpath(filename)
if '.svn' in elems:
if '.svn' in elems or '.git' in elems:
continue
result.append(filename)
return cls(result, **kwargs)

2
_setup/py2/setup.py
View File

@ -182,7 +182,7 @@ def find_packages(manifest):
sep = _os.path.join('1', '2')[1:-1]
for root in collect:
for dirpath, _, filenames in _shell.walk(_os.path.join(lib, root)):
if dirpath.find('.svn') >= 0:
if dirpath.find('.svn') >= 0 or dirpath.find('.git') >= 0:
continue
if '__init__.py' in filenames:
packages[

4
_setup/py2/shell.py
View File

@ -399,7 +399,7 @@ except AttributeError:
yield top, dirs, nondirs
def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
def files(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
""" Determine a filelist """
for dirpath, dirnames, filenames in walk(native(base)):
for item in prune:
@ -425,7 +425,7 @@ def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
dirnames.sort()
def dirs(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
def dirs(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
""" Determine a filelist """
for dirpath, dirnames, filenames in walk(native(base)):
for item in prune:

2
_setup/py3/data.py
View File

@ -97,7 +97,7 @@ class Data(object):
result = []
for filename in files.files:
_, elems = splitpath(filename)
if '.svn' in elems:
if '.svn' in elems or '.git' in elems:
continue
result.append(filename)
return cls(result, **kwargs)

2
_setup/py3/setup.py
View File

@ -183,7 +183,7 @@ def find_packages(manifest):
sep = _os.path.join('1', '2')[1:-1]
for root in collect:
for dirpath, _, filenames in _shell.walk(_os.path.join(lib, root)):
if dirpath.find('.svn') >= 0:
if dirpath.find('.svn') >= 0 or dirpath.find('.git') >= 0:
continue
if '__init__.py' in filenames:
packages[

4
_setup/py3/shell.py
View File

@ -272,7 +272,7 @@ def spawn(*argv, **kwargs):
walk = _os.walk
def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
def files(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
""" Determine a filelist """
for dirpath, dirnames, filenames in walk(native(base)):
for item in prune:
@ -298,7 +298,7 @@ def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
dirnames.sort()
def dirs(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
def dirs(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
""" Determine a filelist """
for dirpath, dirnames, filenames in walk(native(base)):
for item in prune: