Skip to content

Commit 6913c49

Browse files
authored
Merge python-can version 2.0.0 into master
2 parents 8bb52be + ffadec1 commit 6913c49

File tree

112 files changed

+6412
-4052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+6412
-4052
lines changed

.gitignore

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# https://github.com/github/gitignore/blob/da00310ccba9de9a988cc973ef5238ad2c1460e9/Python.gitignore
2+
3+
# Byte-compiled / optimized / DLL files
4+
__pycache__/
5+
*.py[cod]
6+
*$py.class
7+
8+
# C extensions
9+
*.so
10+
11+
# Distribution / packaging
12+
.Python
13+
env/
14+
build/
15+
develop-eggs/
16+
dist/
17+
downloads/
18+
eggs/
19+
.eggs/
20+
lib/
21+
lib64/
22+
parts/
23+
sdist/
24+
var/
25+
*.egg-info/
26+
.installed.cfg
27+
*.egg
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.coverage
43+
.coverage.*
44+
.cache
45+
nosetests.xml
46+
coverage.xml
47+
*,cover
48+
.hypothesis/
49+
50+
# Translations
51+
*.mo
52+
*.pot
53+
54+
# Django stuff:
55+
*.log
56+
57+
# Sphinx documentation
58+
docs/_build/
59+
60+
# PyBuilder
61+
target/
62+
63+
# IDEs
64+
.vscode/
65+
.idea/

.hgflow

Lines changed: 0 additions & 8 deletions
This file was deleted.

.hgignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
language: python
2+
sudo: false
3+
python:
4+
- "2.7"
5+
- "pypy"
6+
- "pypy3"
7+
- "3.4"
8+
- "3.5"
9+
- "3.6"
10+
- "3.7-dev"
11+
- "nightly"
12+
install:
13+
- travis_retry pip install .
14+
- travis_retry pip install -r requirements.txt
15+
16+
script:
17+
- py.test -v

CONTRIBUTORS.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ Bruno Pennati
1616
Jack Jester-Weinstein
1717
Joshua Villyard
1818
Giuseppe Corbelli <[email protected]>
19-
Christian Sandberg
19+
Christian Sandberg
20+
Eduard Bröcker <[email protected]>
21+
Boris Wenzlaff

README renamed to README.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
python-can
22
==========
33

4-
|release| |docs| |build|
4+
|release| |docs| |build|
55

66
.. |release| image:: https://img.shields.io/pypi/v/python-can.svg
77
:target: https://pypi.python.org/pypi/python-can/
88
:alt: Latest Version
99

10-
.. |docs| image:: https://readthedocs.org/projects/python-can/badge/?version=latest
11-
:target: http://python-can.readthedocs.org/en/latest/?badge=latest
10+
.. |docs| image:: https://readthedocs.org/projects/python-can/badge/?version=stable
11+
:target: https://python-can.readthedocs.io/en/stable/
1212
:alt: Documentation Status
1313

14-
.. |build| image:: https://drone.io/bitbucket.org/hardbyte/python-can/status.png
15-
:target: https://drone.io/bitbucket.org/hardbyte/python-can/latest
16-
:alt: CI Server
14+
.. |build| image:: https://travis-ci.org/hardbyte/python-can.svg?branch=develop
15+
:target: https://travis-ci.org/hardbyte/python-can
16+
:alt: CI Server for develop branch
1717

1818

1919
The **C**\ ontroller **A**\ rea **N**\ etwork is a bus standard designed
@@ -36,7 +36,7 @@ Discussion
3636
----------
3737

3838
If you run into bugs, you can file them in our
39-
`issue tracker <https://bitbucket.org/hardbyte/python-can/issues>`__.
39+
`issue tracker <https://github.com/hardbyte/python-can/issues>`__.
4040

4141
There is also a `python-can <https://groups.google.com/forum/#!forum/python-can>`__
4242
mailing list for development discussion.
@@ -45,4 +45,4 @@ mailing list for development discussion.
4545
questions and answers tagged with ``python+can``.
4646

4747
Wherever we interact, we strive to follow the
48-
`Python Community Code of Conduct <https://www.python.org/psf/codeofconduct/>`__.
48+
`Python Community Code of Conduct <https://www.python.org/psf/codeofconduct/>`__.

bin/j1939_logger.py

Lines changed: 0 additions & 128 deletions
This file was deleted.

0 commit comments

Comments
 (0)