Commitae0b6fe

committed

Merge branch 'yarikoptic-bf/tests-on-debians'

2 parentsd8bbfea +fe426d4 commitae0b6feCopy full SHA for ae0b6fe

File tree

+21

-8

lines changed

+21

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`S_IFREG,`
`11`	`11`	`)`
`12`	`12`
`13`		`-S_IFGITLINK=S_IFLNK\|S_IFDIR# a submodule`
`14`		`-`
`15`	`13`	`fromioimportBytesIO`
`16`	`14`	`importos`
`17`	`15`	`importsubprocess`
`@@ -33,7 +31,6 @@`
`33`	`31`	`CE_NAMEMASK,`
`34`	`32`	`CE_STAGESHIFT`
`35`	`33`	`)`
`36`		`-CE_NAMEMASK_INV=~CE_NAMEMASK`
`37`	`34`
`38`	`35`	`from .utilimport (`
`39`	`36`	`pack,`
`@@ -47,6 +44,9 @@`
`47`	`44`	`force_text`
`48`	`45`	`)`
`49`	`46`
	`47`	`+S_IFGITLINK=S_IFLNK\|S_IFDIR# a submodule`
	`48`	`+CE_NAMEMASK_INV=~CE_NAMEMASK`
	`49`	`+`
`50`	`50`	`__all__= ('write_cache','read_cache','write_tree_from_cache','entry_key',`
`51`	`51`	`'stat_mode_to_index_mode','S_IFGITLINK','run_commit_hook','hook_path')`
`52`	`52`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@`
`15`	`15`	`fromgitimportRepo,Remote,GitCommandError,Git`
`16`	`16`	`fromgit.compatimportstring_types`
`17`	`17`
`18`		`-GIT_REPO=os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))`
	`18`	`+osp=os.path.dirname`
	`19`	`+`
	`20`	`+GIT_REPO=os.environ.get("GIT_PYTHON_TEST_GIT_REPO_BASE",osp(osp(osp(osp(__file__)))))`
`19`	`21`
`20`	`22`	`__all__= (`
`21`	`23`	`'fixture_path','fixture','absolute_project_path','StringProcessAdapter',`
`@@ -26,7 +28,7 @@`
`26`	`28`
`27`	`29`
`28`	`30`	`deffixture_path(name):`
`29`		`-test_dir=os.path.dirname(os.path.dirname(__file__))`
	`31`	`+test_dir=osp(osp(__file__))`
`30`	`32`	`returnos.path.join(test_dir,"fixtures",name)`
`31`	`33`
`32`	`34`
`@@ -35,7 +37,7 @@ def fixture(name):`
`35`	`37`
`36`	`38`
`37`	`39`	`defabsolute_project_path():`
`38`		`-returnos.path.abspath(os.path.join(os.path.dirname(__file__),"..",".."))`
	`40`	`+returnos.path.abspath(os.path.join(osp(__file__),"..",".."))`
`39`	`41`
`40`	`42`	`#} END routines`
`41`	`43`
`@@ -195,7 +197,7 @@ def remote_repo_creator(self):`
`195`	`197`
`196`	`198`	`d_remote.config_writer.set('url',remote_repo_url)`
`197`	`199`
`198`		`-temp_dir=os.path.dirname(_mktemp())`
	`200`	`+temp_dir=osp(_mktemp())`
`199`	`201`	`# On windows, this will fail ... we deal with failures anyway and default to telling the user to do it`
`200`	`202`	`try:`
`201`	`203`	`gd=Git().daemon(temp_dir,enable='receive-pack',as_process=True)`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`# This module is part of GitPython and is released under`
`6`	`6`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
`7`	`7`	`importos`
	`8`	`+importsys`
`8`	`9`	`importtempfile`
`9`	`10`
`10`	`11`	`importgit.objects.baseasbase`
`@@ -116,6 +117,14 @@ def test_add_unicode(self, rw_repo):`
`116`	`117`	`filename=u"שלום.txt"`
`117`	`118`
`118`	`119`	`file_path=os.path.join(rw_repo.working_dir,filename)`
	`120`	`+`
	`121`	`+# verify first that we could encode file name in this environment`
	`122`	`+try:`
	`123`	`+file_path.encode(sys.getfilesystemencoding())`
	`124`	`+exceptUnicodeEncodeError:`
	`125`	`+fromnoseimportSkipTest`
	`126`	`+raiseSkipTest("Environment doesn't support unicode filenames")`
	`127`	`+`
`119`	`128`	`open(file_path,"wb").write(b'something')`
`120`	`129`
`121`	`130`	`ifos.name=='nt':`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ commands = {posargs}`
`18`	`18`	`[flake8]`
`19`	`19`	`#show-source = True`
`20`	`20`	`# E265 = comment blocks like @{ section, which it can't handle`
	`21`	`+# E266 = too many leading '#' for block comment`
	`22`	`+# E731 = do not assign a lambda expression, use a def`
`21`	`23`	`# W293 = Blank line contains whitespace`
`22`		`-ignore = E265,W293`
	`24`	`+ignore = E265,W293,E266,E731`
`23`	`25`	`max-line-length = 120`
`24`	`26`	`exclude = .tox,.venv,build,dist,doc,git/ext/`

Comments

(0)