Skip to content

Commit

Permalink
git subrepo pull (merge) external-deps/spyder-kernels
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "0fbc69ff2"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-kernels.git"
  branch:   "master"
  commit:   "0fbc69ff2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
  • Loading branch information
ccordoba12 committed Jun 2, 2021
1 parent f214521 commit 7571a6f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/spyder-ide/spyder-kernels.git
branch = master
commit = e7309e4762b8d53ae29f660dfeba7a97d0cc31f9
parent = b93ae11afcea16b60b392f78caae0b682e062496
commit = 0fbc69ff2a287cd2605236397a5ae829416c9fdc
parent = f214521afe0758fbf5e8fbb9b38a1c18e8246271
method = merge
cmdver = 0.4.3
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def path_is_library(path, initial_pathlist=None):
# library or installed to site-packages.
return True
elif os.name == 'nt':
if re.search(r'.*/pkgs/.*', path):
if re.search(r'.*\\pkgs\\.*', path):
return True
else:
return False
Expand Down

0 comments on commit 7571a6f

Please sign in to comment.