Skip to content

Re-enable Cygwin CI and get most tests passing #1455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jun 21, 2022
Merged

Re-enable Cygwin CI and get most tests passing #1455

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
96fae83
BUG: Fix is_cygwin_git to return True on Cygwin.
DWesl Jun 10, 2022
a67862c
CI: Add a CI job with Cygwin tests
DWesl Jun 10, 2022
3fc07ac
ENH: Update cygpath recodes to work with all installs
DWesl Jun 10, 2022
d8ad56f
CI: Mark GHA repo safe for Git to use
DWesl Jun 10, 2022
f96cea1
CI: Specify full path to python executables.
DWesl Jun 10, 2022
d57a513
FIX: Fix flake8 command line
DWesl Jun 11, 2022
5d874dd
BUG: Convert to native path before checking if absolute
DWesl Jun 11, 2022
21113a8
STY: Remove import of now-unused function
DWesl Jun 11, 2022
863c678
CI: Set temporary directory for tests.
DWesl Jun 11, 2022
f990852
CI: Install virtualenv for Cygwin CI.
DWesl Jun 11, 2022
9be148c
BUG: Use Cygwin paths for Cygwin git
DWesl Jun 11, 2022
aafb92a
CI: Turn of command echo for tests
DWesl Jun 11, 2022
54bae76
TST: Mark test_docs.Tutorials.test_submodules as xfail on Cygwin
DWesl Jun 21, 2022
0eda0a5
TST: Mark test_repo.TestRepo.test_submodules as xfail on Cygwin
DWesl Jun 21, 2022
7f3689d
TST: Mark test_submodule.TestSubmodule.test_root_module as xfail on C…
DWesl Jun 21, 2022
c3fd6c1
FIX: Import pytest in tests.test_docs
DWesl Jun 21, 2022
2996f40
FIX: Mark the correct test_submodule test as xfail on Cygwin
DWesl Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: Use Cygwin paths for Cygwin git
  • Loading branch information
@DWesl
DWesl authored Jun 11, 2022
commit 9be148c65e9e6c7ed6706c12adc785187918da88
6 changes: 4 additions & 2 deletions git/repo/fun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from git.exc import WorkTreeRepositoryUnsupported
from git.objects import Object
from git.refs import SymbolicReference
from git.util import hex_to_bin, bin_to_hex, decygpath
from git.util import hex_to_bin, bin_to_hex, cygpath
from gitdb.exc import (
BadObject,
BadName,
Expand Down Expand Up @@ -109,7 +109,9 @@ def find_submodule_git_dir(d: "PathLike") -> Optional["PathLike"]:

if Git.is_cygwin():
## Cygwin creates submodules prefixed with `/cygdrive/...` suffixes.
path = decygpath(path)
# Cygwin git understands Cygwin paths much better than Windows ones
# Also the Cygwin tests are assuming Cygwin paths.
path = cygpath(path)
if not osp.isabs(path):
path = osp.normpath(osp.join(osp.dirname(d), path))
return find_submodule_git_dir(path)
Expand Down