Skip to content
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.

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

Bump pathspec to 0.10.3 #8767

Merged
merged 1 commit into from
Jan 13, 2023
Merged

Bump pathspec to 0.10.3 #8767

merged 1 commit into from
Jan 13, 2023

Conversation

karajan1001
Copy link
Contributor

fix: #8217

  1. Replace group names to avoid conflict.
  2. Disable failed tests.
  3. Bump pathspec to 0.10.3

Wait for scmrepo to update to iterative/scmrepo#163

Thank you for the contribution - we'll try to review it as soon as possible. 🙏

@karajan1001 karajan1001 requested review from skshetry and dtrifiro and removed request for skshetry January 5, 2023 10:36
@karajan1001 karajan1001 force-pushed the fix8217 branch 2 times, most recently from 3fea844 to 743209e Compare January 6, 2023 08:35
@codecov
Copy link

codecov bot commented Jan 6, 2023

Codecov Report

Base: 93.64% // Head: 93.64% // Decreases project coverage by -0.00% ⚠️

Coverage data is based on head (2d4978c) compared to base (178244f).
Patch coverage: 85.71% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8767      +/-   ##
==========================================
- Coverage   93.64%   93.64%   -0.01%     
==========================================
  Files         456      456              
  Lines       36122    36128       +6     
  Branches     5227     5228       +1     
==========================================
+ Hits        33827    33832       +5     
  Misses       1799     1799              
- Partials      496      497       +1     
Impacted Files Coverage Δ
tests/func/experiments/test_remote.py 100.00% <ø> (ø)
tests/unit/test_ignore.py 100.00% <ø> (ø)
dvc/ignore.py 89.88% <85.71%> (-0.16%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

GitWildMatchPattern.pattern_to_regex(pattern_info.patterns)
for pattern_info in pattern_list
]
self.regex_pattern_list = []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Do you have benchmarks for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I hadn't, The PR only did some name field jobs and didn't touch the matching logic.

@@ -87,7 +87,7 @@ def mock_dvcignore(dvcignore_path, patterns):
("to_ignore.txt", ["/*.txt"], True),
(os.path.join("path", "to_ignore.txt"), ["/*.txt"], False),
(os.path.join("data", "file.txt"), ["data/*"], True),
(os.path.join("data", "subdir", "file.txt"), ["data/*"], False),
# (os.path.join("data", "subdir", "file.txt"), ["data/*"], False),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commented-out test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a newly introduced bug by pathspec. need to give more comments here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a core use case? Do we need to maybe stick with an older version and report/fix this bug in pathspec? Is there a pathspec issue for it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we need to report to them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karajan1001, can we workaround this? I don't think we should merge this with this bug otherwise.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karajan1001 accidental merge or do you plan on fixing it in a followup?

Copy link
Contributor Author

@karajan1001 karajan1001 Jan 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current behavior is the same as git.

g check-ignore dir/subdir/a -v                                                                                                                                  [ins]
.gitignore:2:dir/*	dir/subdir/a

We should change it to
(os.path.join("data", "subdir", "file.txt"), ["data/*"], True),

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this is a bugfix then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

fix: iterative#8217
1. Replace group name to avoid conflict.
2. Disable failed tests.
3. Bump pathspec to 0.10.3
@karajan1001 karajan1001 merged commit fc1a192 into iterative:main Jan 13, 2023
@karajan1001 karajan1001 deleted the fix8217 branch January 13, 2023 14:47
@efiop
Copy link
Contributor

efiop commented Jan 13, 2023

@karajan1001 There are a few unaddressed points above. Accidental merge?

karajan1001 added a commit to karajan1001/dvc that referenced this pull request Mar 8, 2023
@karajan1001 karajan1001 mentioned this pull request Mar 8, 2023
1 task
efiop pushed a commit that referenced this pull request Mar 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dvc pull: re.error: redefinition of group name 'ps_d' as group 2; was group 1 at position 46
4 participants