Skip to content

Commit

Permalink
relaxed license to Lesser GPL v3+
Browse files Browse the repository at this point in the history
  • Loading branch information
miccoli committed Jan 19, 2019
1 parent 1bed209 commit 9afd404
Show file tree
Hide file tree
Showing 10 changed files with 189 additions and 690 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

v0.10.0.post1 (2019-01-19)
--------------------------

v0.10.0 re-licensed under LGPL v3

v0.10.0 (2016-03-30)
--------------------

Expand Down
829 changes: 160 additions & 669 deletions LICENSE.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The code base is written in Python 2, but Python 3 is fully supported,
and is the main developing language. Running the ``2to3`` tool will
generate valid and, whenever possible, idiomatic Python 3 code.

Explicitly supported versions are Python 2.6, 2.7, 3.2 through 3.5.
Explicitly supported versions are Python 2.7, 3.3 through 3.7.


Documentation
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ and is the main developing language. Running the ``2to3`` tool will
generate valid and, whenever possible, idiomatic Python 3 code. The
present documentation refers to the Python 3 version of the package.

Explicitly supported versions are Python 2.6, 2.7, 3.2 through 3.5.
Explicitly supported versions are Python 2.7, 3.3 through 3.7.

Install from PyPI
-----------------
Expand Down
4 changes: 4 additions & 0 deletions docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ hardcoded
designator
builtin
keepalive
Wikipedia
ftp
java
fallback
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,22 @@
author='Stefano Miccoli',
author_email='[email protected]',
url='https://github.com/miccoli/pyownet',
license='GPL',
license='LGPLv3',
keywords=['OWFS', ],
classifiers=[
'Development Status :: 3 - Alpha',
'Environment :: Other Environment',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Home Automation',
],
package_dir={'': 'src'},
packages=['pyownet', ],
Expand Down
8 changes: 4 additions & 4 deletions src/pyownet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
# Copyright 2013-2016 Stefano Miccoli
#
# This python package is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the Lesser GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# Lesser GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# You should have received a copy of the Lesser GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

__all__ = ['__version__', 'Error']
__version__ = '0.10.0'
__version__ = '0.10.0.post1'


class Error(Exception):
Expand Down
6 changes: 3 additions & 3 deletions src/pyownet/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
# Copyright 2013-2016 Stefano Miccoli
#
# This python package is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the Lesser GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# Lesser GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# You should have received a copy of the Lesser GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

Expand Down
6 changes: 3 additions & 3 deletions src/pyownet/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
# Copyright 2013-2016 Stefano Miccoli
#
# This python package is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the Lesser GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# Lesser GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# You should have received a copy of the Lesser GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py32, py33, py34, py35, pypy, pypy3, pep8, docs,
envlist = py27, py33, py34, py35, py36, py37, pypy, pypy3, pep8, docs,

[testenv]
commands = {envpython} -m tests.test_protocol

[testenv:py26]
deps = unittest2

[testenv:pep8]
basepython = python2.7
deps = flake8
Expand All @@ -23,11 +20,12 @@ commands =
[flake8]
jobs = auto
#max-complexity = 10
#ignore = E222,E126
ignore = E226,E305,E402

[testenv:docs]
deps =
sphinx
sphinx_rtd_theme
docutils
sphinxcontrib-spelling
pyenchant
Expand Down

0 comments on commit 9afd404

Please sign in to comment.