Skip to content

Complete broken PR #1156 (Specific Exceptions: Adapting slcan interface) #1166

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

Merged
merged 6 commits into from
Nov 16, 2021

Conversation

felixdivo
Copy link
Collaborator

I am sorry, #1156 should not have been merged as some changes were still missing. This PR corrects that.

@felixdivo felixdivo added this to the 4.0.0 Release milestone Nov 11, 2021
@felixdivo felixdivo self-assigned this Nov 11, 2021
@codecov
Copy link

codecov bot commented Nov 11, 2021

Codecov Report

Merging #1166 (a6256e8) into develop (270224c) will increase coverage by 0.46%.
The diff coverage is 68.42%.

@@             Coverage Diff             @@
##           develop    #1166      +/-   ##
===========================================
+ Coverage    70.81%   71.28%   +0.46%     
===========================================
  Files           79       79              
  Lines         7737     7867     +130     
===========================================
+ Hits          5479     5608     +129     
- Misses        2258     2259       +1     

@mergify mergify bot requested a review from hardbyte November 11, 2021 16:20
@felixdivo
Copy link
Collaborator Author

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Nov 11, 2021

rebase

✅ Branch has been successfully rebased

Hey, I reacted but my real name is @Mergifyio

@hardbyte hardbyte force-pushed the felixdivo-issue-1046-slcan-fix branch from 0557d12 to 5227113 Compare November 11, 2021 21:00
@mergify
Copy link
Contributor

mergify bot commented Nov 11, 2021

rebase

☑️ Nothing to do

  • -closed [:pushpin: rebase requirement]
  • #commits-behind>0 [:pushpin: rebase requirement]

@felixdivo
Copy link
Collaborator Author

@hardbyte Thanks for your review. I also added a tiny test code fix for the recent failures of test (windows-latest, false, pypy-3.7) in GitHub Actions un multiple branches. The test code was just not updated after some refactoring.

@felixdivo felixdivo merged commit 9080c47 into develop Nov 16, 2021
@felixdivo felixdivo deleted the felixdivo-issue-1046-slcan-fix branch November 16, 2021 21:35
cowo78 pushed a commit to cowo78/python-can that referenced this pull request Dec 9, 2021
… interface) (hardbyte#1166)

* Complete switch to new exceptions

* Format code

* Fix TestBaseRotatingLogger
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants