Skip to content

Conversation

@felixdivo
Copy link
Collaborator

Part of #1046.

Since the NI-XNET interface was not released in a stable release yet (see #968), we can freely change the exception handling without deprecation notices.

Part of #1046.

Since the NI-XNET interface was not released in a stable release yet (see #968), we can freely change the exception handling without deprecation notices.
@felixdivo felixdivo added enhancement api backend:nixnet National Instruments - XNET labels Oct 27, 2021
@felixdivo felixdivo added this to the 4.0.0 Release milestone Oct 27, 2021
@felixdivo felixdivo self-assigned this Oct 27, 2021
@mergify mergify bot requested a review from hardbyte October 27, 2021 14:58
@codecov
Copy link

codecov bot commented Oct 27, 2021

Codecov Report

Merging #1154 (46c3564) into develop (270224c) will increase coverage by 0.06%.
The diff coverage is 44.44%.

@@             Coverage Diff             @@
##           develop    #1154      +/-   ##
===========================================
+ Coverage    70.81%   70.87%   +0.06%     
===========================================
  Files           79       79              
  Lines         7737     7729       -8     
===========================================
- Hits          5479     5478       -1     
+ Misses        2258     2251       -7     

@felixdivo
Copy link
Collaborator Author

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Nov 17, 2021

rebase

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/1)
Auto-merging can/interfaces/nixnet.py
CONFLICT (content): Merge conflict in can/interfaces/nixnet.py
error: could not apply 4a4a57a... Specific Exceptions: Adapting nixnet interface
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 4a4a57a... Specific Exceptions: Adapting nixnet interface

err-code: C0CBE

@felixdivo
Copy link
Collaborator Author

I'd appreciate a review of this change

1 similar comment
@felixdivo
Copy link
Collaborator Author

I'd appreciate a review of this change

@hardbyte hardbyte merged commit 73057d8 into develop Dec 14, 2021
@hardbyte hardbyte deleted the felixdivo-issue-1046-nixnet branch December 14, 2021 07:37
@felixdivo
Copy link
Collaborator Author

Thanks Brian!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api backend:nixnet National Instruments - XNET enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants