Skip to content

Commit

Permalink
Merge python-can version 2.0.0 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
hardbyte authored Jan 4, 2018
2 parents 8bb52be + ffadec1 commit 6913c49
Show file tree
Hide file tree
Showing 112 changed files with 6,412 additions and 4,052 deletions.
65 changes: 65 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# https://github.com/github/gitignore/blob/da00310ccba9de9a988cc973ef5238ad2c1460e9/Python.gitignore

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# IDEs
.vscode/
.idea/
8 changes: 0 additions & 8 deletions .hgflow

This file was deleted.

8 changes: 0 additions & 8 deletions .hgignore

This file was deleted.

17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
language: python
sudo: false
python:
- "2.7"
- "pypy"
- "pypy3"
- "3.4"
- "3.5"
- "3.6"
- "3.7-dev"
- "nightly"
install:
- travis_retry pip install .
- travis_retry pip install -r requirements.txt

script:
- py.test -v
4 changes: 3 additions & 1 deletion CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ Bruno Pennati
Jack Jester-Weinstein
Joshua Villyard
Giuseppe Corbelli <[email protected]>
Christian Sandberg
Christian Sandberg
Eduard Bröcker <[email protected]>
Boris Wenzlaff
16 changes: 8 additions & 8 deletions README → README.rst
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
python-can
==========

|release| |docs| |build|
|release| |docs| |build|

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

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

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


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

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

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

Wherever we interact, we strive to follow the
`Python Community Code of Conduct <https://www.python.org/psf/codeofconduct/>`__.
`Python Community Code of Conduct <https://www.python.org/psf/codeofconduct/>`__.
128 changes: 0 additions & 128 deletions bin/j1939_logger.py

This file was deleted.

Loading

0 comments on commit 6913c49

Please sign in to comment.