Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
CHANGES
=======

1.1.4
-----

- Added links to contributing in README

- Added CONTRIBUTING.rst file

- Pinned dependencies for python 2

1.1.3
-----

Expand Down
7 changes: 7 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Contributing
------------

The development and the testing follows the Common Robot Libraries development
practices defined in crl-devutils_.

.. _crl-devutils: http://crl-devutils.readthedocs.io/
21 changes: 19 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
.. image:: https://travis-ci.org/nokia/crl-examplelib.svg?branch=master
:target: https://travis-ci.org/nokia/crl-examplelib

README
======

Example for Common Robot Library
--------------------------------

Expand All @@ -16,13 +19,27 @@ demonstrating acceptance test capability.
Documentation
-------------

Documentation for crl.examplelib can be found from `Read The Docs`_
Documentation for crl.examplelib can be found from `Read the Docs`_

.. _Read The Docs: http://crlexamplelib.readthedocs.io/
.. _Read the Docs: http://crlexamplelib.readthedocs.io/


Development practices
---------------------

The development and the testing follows the Common Robot Libraries development
practices defined in https://github.com/nokia/crl-devutils.

Contributing
------------

Please see contributing_ for development and contribution practises.

The code_ and the issues_ are hosted on GitHub.

The project is licensed under BSD-3-Clause_.

.. _contributing: https://github.com/nokia/crl-examplelib/blob/master/CONTRIBUTING.rst
.. _code: https://github.com/nokia/crl-examplelib
.. _issues: https://github.com/nokia/crl-examplelib/issues
.. _BSD-3-Clause: https://github.com/nokia/crl-examplelib/blob/master/LICENSE
2 changes: 1 addition & 1 deletion src/crl/examplelib/_version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__copyright__ = 'Copyright (C) 2019, Nokia'
VERSION = '1.1.3'
VERSION = '1.1.4'
GITHASH = ''


Expand Down
35 changes: 28 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
[tox]
envlist = py27, py36, pylint

[base]
deps =
mock
pytest-cov
pytest-flake8

[base2]
deps =
{[base]deps}
pytest < 4.6
more-itertools <= 5.0.0

[base3]
deps =
{[base]deps}
pytest

[testenv]
setenv =
COVERAGE_FILE = .coverage{envname}
Expand All @@ -13,27 +30,31 @@ commands = {posargs:py.test \
--cov-config {toxinidir}/.coveragerc \
--cov={envsitepackagesdir}/crl/examplelib \
{envsitepackagesdir}/crl/examplelib {toxinidir}/tests}

deps =
mock
pytest
pytest-cov
pytest-flakes
pytest-pep8
py27: {[base2]deps}
py36: {[base3]deps}

[pytest]
addopts = --pep8 --flakes --cov-report xml
addopts = --flake8 --cov-report xml
flakes-ignore =
test_*.py UnusedImport
test_*.py RedefinedWhileUnused
norecursedirs = bin lib include

[testenv:pylint]
basepython = python2.7
deps =
pylint < 2.0
{[testenv]deps}
commands = pylint {posargs: --rcfile={toxinidir}/.pylintrc \
{toxinidir}/src/crl {toxinidir}/tests }

[testenv:pylint3]
basepython = python3.7
deps =
pylint
commands = {[testenv:pylint]commands}

[testenv:docs]
changedir = {toxinidir}
deps=
Expand Down