Skip to content

Release/4.0.0#1260

Merged
hardbyte merged 1007 commits intomasterfrom
release/4.0.0
Feb 18, 2022
Merged

Release/4.0.0#1260
hardbyte merged 1007 commits intomasterfrom
release/4.0.0

Conversation

@hardbyte
Copy link
Copy Markdown
Owner

@hardbyte hardbyte commented Feb 18, 2022

Merges master into develop (accepting develop for all conflicts).

Might take the opportunities to get with the times and rename master -> main in github too.

felixdivo and others added 30 commits June 9, 2021 08:55
Elevate python installation on Travis CI to fix ARM setup
Rewrite ARM Travis CI setup
Add bdist_wheel distribution to automated Travis CI deployment
Specific Exceptions: Adapting neousys (+ bugfixes & simplifications)
…direction-of-can-fd

Add msg direction for CAN-FD in BlfReader
Tbruno25 and others added 23 commits January 26, 2022 17:35
Co-authored-by: zariiii9003 <[email protected]>
Enable mypy for vector interface
…n-removed

Remove unnssesary conversion to list
* Adress pylint issues

* Format code with black

* Fix line-too-long

* Fix abstract-method

* Fix line-too-long

Co-authored-by: felixdivo <[email protected]>
* Fix deprecation in test case

* Modernize example

* Better test_asyncio_notifier()

* Format code with black

* Attempt to fix typing; improve docs

* try to fix mypy failure with type annotation

* Better bus handling

* Doc fix

* Fix type errors in notifier.py

* Format code with black

* Fix example typing

* Fix too long line in doc

* Switch name from Listenable to MessageRecipient

Co-authored-by: felixdivo <[email protected]>
* Fix entry_points deprectaion

* Format code with black

* Undo change that shall be in a separate PR

Co-authored-by: felixdivo <[email protected]>
* Adds a CONTRIBUTING.md file which links to our docs

* Remove email addresses from contributors.txt

* Add github handles for new contributors

* Update history.rst
* If parsed data has shortened, overwrite end of line with spaces

This bug could easily be replicated by running:
  `python can_viewer.py -c vcan0 -i socketcan -d "123:>BB"`
In another terminal send:
  `cansend vcan0 123#FFFF`
Followed by:
  `cansend vcan0 123#0001`

* Fill until end of available line after parsed data
as suggedted by @zariiii9003
* Pass flags instead of flags_t type for USB2CAN

* Remove usb2can unused open arguments for super

Co-authored-by: Jacob Erickson <[email protected]>
# Conflicts:
#	.travis.yml
#	CHANGELOG.txt
#	can/__init__.py
#	can/bus.py
#	can/interfaces/canalystii.py
#	can/interfaces/ics_neovi/neovi_bus.py
#	can/interfaces/ixxat/canlib.py
#	can/interfaces/socketcan/constants.py
#	can/interfaces/socketcan/socketcan.py
#	can/interfaces/vector/canlib.py
#	can/interfaces/vector/vxlapi.py
#	can/io/asc.py
#	can/io/blf.py
#	can/io/canutils.py
#	can/io/csv.py
#	can/message.py
#	can/player.py
#	doc/development.rst
#	setup.py
#	test/data/logfile.asc
#	test/logformats_test.py
#	test/test_cyclic_socketcan.py
#	test/test_message_class.py
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 18, 2022

Codecov Report

Merging #1260 (1fd5228) into master (ab793f6) will increase coverage by 0.03%.
The diff coverage is 52.49%.

@@            Coverage Diff             @@
##           master    #1260      +/-   ##
==========================================
+ Coverage   65.96%   65.99%   +0.03%     
==========================================
  Files          63       86      +23     
  Lines        5855     8905    +3050     
==========================================
+ Hits         3862     5877    +2015     
- Misses       1993     3028    +1035     

@hardbyte hardbyte requested review from felixdivo and removed request for felixdivo February 18, 2022 23:40
@hardbyte
Copy link
Copy Markdown
Owner Author

I don't think there is any point of requesting a review on a 30k diff!

@hardbyte hardbyte merged commit 485e71a into master Feb 18, 2022
@mergify mergify Bot deleted the release/4.0.0 branch February 18, 2022 23:56
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.