Merge pull request #98 from MartinHjelmare/release-0.10

0.10
theolind · May 6, 2017 · f42a6e3 · f42a6e3
2 parents c07773d + 85e52f0
commit f42a6e3
Show file tree

Hide file tree

Showing 12 changed files with 276 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,178 @@
+# Change Log
+
+## [0.10](https://github.com/theolind/pymysensors/tree/0.10) (2017-05-07)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.9.1...0.10)
+
+**Closed issues:**
+
+- Publish pymysensors on pypi [\#94](https://github.com/theolind/pymysensors/issues/94)
+
+**Merged pull requests:**
+
+- Add release instructions and update setup [\#97](https://github.com/theolind/pymysensors/pull/97) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add manifest and update setup files [\#96](https://github.com/theolind/pymysensors/pull/96) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add changelog [\#95](https://github.com/theolind/pymysensors/pull/95) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.9.1](https://github.com/theolind/pymysensors/tree/0.9.1) (2017-04-11)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.9...0.9.1)
+
+**Merged pull requests:**
+
+- 0.9.1 [\#93](https://github.com/theolind/pymysensors/pull/93) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix pickle persistence when upgrading to 0.9 [\#92](https://github.com/theolind/pymysensors/pull/92) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.9](https://github.com/theolind/pymysensors/tree/0.9) (2017-04-03)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.8...0.9)
+
+**Closed issues:**
+
+- Use of OTA with MYSBootloader [\#82](https://github.com/theolind/pymysensors/issues/82)
+- Question: Information in event callback [\#76](https://github.com/theolind/pymysensors/issues/76)
+
+**Merged pull requests:**
+
+- 0.9 [\#90](https://github.com/theolind/pymysensors/pull/90) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update readme about message structure [\#89](https://github.com/theolind/pymysensors/pull/89) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update readme about support for bootloaders [\#88](https://github.com/theolind/pymysensors/pull/88) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix ota with persistence [\#87](https://github.com/theolind/pymysensors/pull/87) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add Message method modify [\#86](https://github.com/theolind/pymysensors/pull/86) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add more envs to tox and travis [\#85](https://github.com/theolind/pymysensors/pull/85) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Move gateways into separate modules [\#84](https://github.com/theolind/pymysensors/pull/84) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Return local time instead of UTC time from Controller [\#81](https://github.com/theolind/pymysensors/pull/81) ([proddy](https://github.com/proddy))
+- Add discover [\#79](https://github.com/theolind/pymysensors/pull/79) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Event callback extensions [\#78](https://github.com/theolind/pymysensors/pull/78) ([steve-bate](https://github.com/steve-bate))
+- tcp\_check to reconnect in case of connection lost [\#67](https://github.com/theolind/pymysensors/pull/67) ([afeno](https://github.com/afeno))
+
+## [0.8](https://github.com/theolind/pymysensors/tree/0.8) (2016-10-19)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.7.1...0.8)
+
+**Closed issues:**
+
+- Sensors loaded through persistence does not trigger subscription [\#70](https://github.com/theolind/pymysensors/issues/70)
+
+**Merged pull requests:**
+
+- 0.8 [\#75](https://github.com/theolind/pymysensors/pull/75) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix init call order [\#74](https://github.com/theolind/pymysensors/pull/74) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix support for stream message type in MQTTGateway [\#73](https://github.com/theolind/pymysensors/pull/73) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix MQTT persistence [\#72](https://github.com/theolind/pymysensors/pull/72) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix parse message to mqtt topic [\#71](https://github.com/theolind/pymysensors/pull/71) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix changing attributes on existing sensor [\#69](https://github.com/theolind/pymysensors/pull/69) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix log spam by disconnecting at serial exception [\#68](https://github.com/theolind/pymysensors/pull/68) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.7.1](https://github.com/theolind/pymysensors/tree/0.7.1) (2016-08-21)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.7...0.7.1)
+
+**Closed issues:**
+
+- Upgrade 0.7: Missing attributes after loading persistence file [\#65](https://github.com/theolind/pymysensors/issues/65)
+
+**Merged pull requests:**
+
+- Hotfix 0.7.1 [\#66](https://github.com/theolind/pymysensors/pull/66) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix persistence with missing attributes [\#64](https://github.com/theolind/pymysensors/pull/64) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.7](https://github.com/theolind/pymysensors/tree/0.7) (2016-08-20)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.6...0.7)
+
+**Closed issues:**
+
+- Support for the 2.0 mysensors / Local Sensor on Gateway [\#51](https://github.com/theolind/pymysensors/issues/51)
+- Reading garbage after reconnect with pyserial 2.7-3.0 [\#12](https://github.com/theolind/pymysensors/issues/12)
+
+**Merged pull requests:**
+
+- 0.7 [\#63](https://github.com/theolind/pymysensors/pull/63) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update readme with new features [\#62](https://github.com/theolind/pymysensors/pull/62) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add more unit tests [\#61](https://github.com/theolind/pymysensors/pull/61) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add child description [\#60](https://github.com/theolind/pymysensors/pull/60) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix disconnect while tread loop is still running [\#59](https://github.com/theolind/pymysensors/pull/59) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix default MQTT topic prefix [\#58](https://github.com/theolind/pymysensors/pull/58) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add request for re-presentation of node [\#57](https://github.com/theolind/pymysensors/pull/57) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add OTA firmware update feature [\#56](https://github.com/theolind/pymysensors/pull/56) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix continue on numbered list [\#55](https://github.com/theolind/pymysensors/pull/55) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add how to contribute [\#54](https://github.com/theolind/pymysensors/pull/54) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update readme [\#53](https://github.com/theolind/pymysensors/pull/53) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix and add missing set,req and internal api types [\#52](https://github.com/theolind/pymysensors/pull/52) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update pyserial to version 3.1.1 [\#50](https://github.com/theolind/pymysensors/pull/50) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add MQTT client Gateway layer [\#49](https://github.com/theolind/pymysensors/pull/49) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update handle\_req to return zero values [\#48](https://github.com/theolind/pymysensors/pull/48) ([myallh](https://github.com/myallh))
+- Handle heartbeat message [\#46](https://github.com/theolind/pymysensors/pull/46) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add class for testing protocol\_version 1.5 [\#45](https://github.com/theolind/pymysensors/pull/45) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add const for mysensors 2.0 [\#44](https://github.com/theolind/pymysensors/pull/44) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Bump version to 0.7.dev0 [\#43](https://github.com/theolind/pymysensors/pull/43) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.6](https://github.com/theolind/pymysensors/tree/0.6) (2016-04-19)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.5...0.6)
+
+**Closed issues:**
+
+- Error on loading of sensors JSON after inpropper shutdown [\#40](https://github.com/theolind/pymysensors/issues/40)
+- Parse error on gateway startup [\#17](https://github.com/theolind/pymysensors/issues/17)
+- Crash when a node has already ID but gateway doesn't know it [\#10](https://github.com/theolind/pymysensors/issues/10)
+- Problems seeing node mysensor data on home assistant dashboard using mysensors.py [\#7](https://github.com/theolind/pymysensors/issues/7)
+
+**Merged pull requests:**
+
+- 0.6 [\#42](https://github.com/theolind/pymysensors/pull/42) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add safe saving and loading of persistence file [\#41](https://github.com/theolind/pymysensors/pull/41) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Move except statements upstream [\#39](https://github.com/theolind/pymysensors/pull/39) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Handle error for unknown node during presentation [\#38](https://github.com/theolind/pymysensors/pull/38) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add test env, local and travis [\#36](https://github.com/theolind/pymysensors/pull/36) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Update readme and main.py [\#35](https://github.com/theolind/pymysensors/pull/35) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add protocol\_version to json encoder [\#34](https://github.com/theolind/pymysensors/pull/34) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Rename tests/test.py to tests/test\_mysensors.py [\#33](https://github.com/theolind/pymysensors/pull/33) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- don't let exceptions in event callback bubble up into library. [\#32](https://github.com/theolind/pymysensors/pull/32) ([Br3nda](https://github.com/Br3nda))
+- Travis [\#31](https://github.com/theolind/pymysensors/pull/31) ([Br3nda](https://github.com/Br3nda))
+- Add TCP ethernet gateway [\#28](https://github.com/theolind/pymysensors/pull/28) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.5](https://github.com/theolind/pymysensors/tree/0.5) (2016-02-12)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.4...0.5)
+
+**Closed issues:**
+
+- Unable to send message to actuator without delay between each char, Arduino Pro Mini 3.3 V [\#21](https://github.com/theolind/pymysensors/issues/21)
+
+**Merged pull requests:**
+
+- Version 0.5 [\#27](https://github.com/theolind/pymysensors/pull/27) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix add\_child\_sensor [\#26](https://github.com/theolind/pymysensors/pull/26) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix some PEP issues. [\#25](https://github.com/theolind/pymysensors/pull/25) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Handling message-type req [\#24](https://github.com/theolind/pymysensors/pull/24) ([forsberg](https://github.com/forsberg))
+- Add kwargs to set\_child\_value functions [\#23](https://github.com/theolind/pymysensors/pull/23) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix PEP issues [\#20](https://github.com/theolind/pymysensors/pull/20) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Remove sleep in connect function [\#19](https://github.com/theolind/pymysensors/pull/19) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Add threading.lock for send function [\#16](https://github.com/theolind/pymysensors/pull/16) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix decode partial data [\#15](https://github.com/theolind/pymysensors/pull/15) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.4](https://github.com/theolind/pymysensors/tree/0.4) (2016-01-07)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.3...0.4)
+
+**Merged pull requests:**
+
+- Version 0.4 [\#14](https://github.com/theolind/pymysensors/pull/14) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fifo queue, implementing switches [\#13](https://github.com/theolind/pymysensors/pull/13) ([MartinHjelmare](https://github.com/MartinHjelmare))
+- Fix attributes [\#11](https://github.com/theolind/pymysensors/pull/11) ([MartinHjelmare](https://github.com/MartinHjelmare))
+
+## [0.3](https://github.com/theolind/pymysensors/tree/0.3) (2015-10-09)
+[Full Changelog](https://github.com/theolind/pymysensors/compare/0.2...0.3)
+
+**Closed issues:**
+
+- Install error on Home Assistant. [\#5](https://github.com/theolind/pymysensors/issues/5)
+
+**Merged pull requests:**
+
+- Bump the version number to 0.3. [\#9](https://github.com/theolind/pymysensors/pull/9) ([andythigpen](https://github.com/andythigpen))
+- Pass protocol version through from SerialGateway to Gateway. [\#8](https://github.com/theolind/pymysensors/pull/8) ([andythigpen](https://github.com/andythigpen))
+
+## [0.2](https://github.com/theolind/pymysensors/tree/0.2) (2015-08-15)
+**Merged pull requests:**
+
+- Add setup.py [\#4](https://github.com/theolind/pymysensors/pull/4) ([balloob](https://github.com/balloob))
+- Fix ValueError issue when decoding a message. [\#2](https://github.com/theolind/pymysensors/pull/2) ([andythigpen](https://github.com/andythigpen))
+- Improvements [\#1](https://github.com/theolind/pymysensors/pull/1) ([andythigpen](https://github.com/andythigpen))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,7 @@
+include CHANGELOG.md
+include CONTRIBUTING.md
+include LICENSE
+include README.md
+
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ GATEWAY = mysensors.TCPGateway(
   port=5003, timeout=1.0, reconnect_timeout=10.0)
 ```
 
-The MQTT gateway requires MySensors serial API v2.0 and the MQTT client gateway example sketch loaded in the gateway Arduino. The gateway also requires an MQTT broker and a python MQTT client interface to the broker. See [mqtt.py](mqtt.py) for an example of how to implement this and initialize the MQTT gateway.
+The MQTT gateway requires MySensors serial API v2.0 and the MQTT client gateway example sketch loaded in the gateway Arduino. The gateway also requires an MQTT broker and a python MQTT client interface to the broker. See [mqtt.py](https://github.com/theolind/pymysensors/blob/master/mqtt.py) for an example of how to implement this and initialize the MQTT gateway.
 
 ## Over the air (OTA) firmware updates
 Call `Gateway` method `update_fw` to set one or more nodes for OTA

diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,40 @@
+# Release procedure
+- Create [.pypirc](https://docs.python.org/3.6/distutils/packageindex.html#the-pypirc-file)
+  if missing.
+
+	```
+	[distutils]
+	index-servers=
+			pypi
+			test
+
+	[test]
+	repository = https://testpypi.python.org/pypi
+	username = username
+	password = password
+
+	[pypi]
+	repository = https://pypi.python.org/pypi
+	username = username
+	password = password
+	```
+
+- Create a release branch from dev.
+- Merge master into the release branch to make the PR mergeable.
+- Update `CHANGELOG.md` by running `scripts/gen_changelog`.
+- Replace the unreleased header in the changelog with the new release number.
+- Update version in `setup.py`.
+- Commit and push the release branch.
+- Create a pull request from release branch to master with the upcoming release number as the title. Put the changes for the new release from the updated changelog as the PR message.
+- Merge the pull request into master, do not squash.
+- Go to github releases and tag a new release on the master branch.
+- Fetch and checkout the master branch.
+- Generate `README.rst` by running `scripts/gen_rst` (pandoc needed).
+- Build source and wheel distributions:
+  ```
+  rm -rf build
+  rm -rf dist
+  python3 setup.py sdist bdist_wheel
+  ```
+- Stage release: `twine upload -r test dist/*`
+- Release: `twine upload -r pypi dist/*`
diff --git a/mysensors/gateway_tcp.py b/mysensors/gateway_tcp.py
@@ -39,7 +39,7 @@ def _check_connection(self):
             self.disconnect()
             _LOGGER.info('No response. Disconnected.')
             return
-        if not (self.tcp_check_timer + self.reconnect_timeout) < time.time():
+        if (self.tcp_check_timer + self.reconnect_timeout) >= time.time():
             return
         msg = Message().copy(
             child_id=255, type=self.const.MessageType.internal,

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-pyserial>=3.1.1
-IntelHex>=2.1
-crcmod>=1.7
+pyserial==3.1.1
+IntelHex==2.1
+crcmod==1.7
diff --git a/requirements_pypi.txt b/requirements_pypi.txt
@@ -0,0 +1,2 @@
+twine>=1.8.1
+wheel>=0.29.0
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,6 +1,6 @@
-flake8>=2.5.1
-pylint>=1.5.3
-pytest>=2.8.0
-pytest-cov>=2.2.0
-pytest-timeout>=1.0.0
-pydocstyle>=1.0.0
+flake8==2.5.1
+pylint==1.5.3
+pytest==2.8.0
+pytest-cov==2.2.0
+pytest-timeout==1.0.0
+pydocstyle==1.0.0
diff --git a/scripts/gen_changelog b/scripts/gen_changelog
@@ -0,0 +1,7 @@
+#!/bin/sh
+if ! gem list github_changelog_generator -i; then
+  echo "github_changelog_generator must be installed before running this \
+script.\nInstall with (requires Ruby):\ngem install github_changelog_generator";
+else
+  github_changelog_generator -u theolind -p pymysensors
+fi
diff --git a/scripts/gen_rst b/scripts/gen_rst
@@ -0,0 +1,6 @@
+#!/bin/sh
+if command -v pandoc >/dev/null ; then
+  pandoc --from=markdown --to=rst README.md -o README.rst
+else
+  echo "Install pandoc to generate README.rst"
+fi
diff --git a/setup.cfg b/setup.cfg
@@ -2,4 +2,4 @@
 ignore = D203
 
 [metadata]
-description-file = README.md
+license_file = LICENSE
diff --git a/setup.py b/setup.py
@@ -1,15 +1,33 @@
 """Setup file for mysensors package."""
-from setuptools import setup
+import os
+from setuptools import setup, find_packages
+
+if os.path.exists('README.rst'):
+    README = open('README.rst').read()
+else:
+    README = ''
 
 setup(
     name='pymysensors',
-    version='0.9.1',
+    version='0.10.0',
     description='Python API for talking to a MySensors gateway',
+    long_description=README,
     url='https://github.com/theolind/pymysensors',
     author='Theodor Lindquist',
     author_email='[email protected]',
-    license='MIT',
+    license='MIT License',
     install_requires=['pyserial>=3.1.1', 'crcmod>=1.7', 'IntelHex>=2.1'],
-    packages=['mysensors'],
-    zip_safe=True
-)
+    packages=find_packages(exclude=['tests', 'tests.*']),
+    keywords=['sensor', 'actuator', 'IoT', 'DYI'],
+    zip_safe=True,
+    classifiers=[
+        'Intended Audience :: Developers',
+        'Intended Audience :: End Users/Desktop',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Home Automation',
+    ])