diff --git a/README.rst b/README.rst index 2020494..cfb3dd8 100644 --- a/README.rst +++ b/README.rst @@ -67,4 +67,10 @@ Links * http://pypi.python.org/pypi/RPi.GPIO * http://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Peripherals.pdf * http://www.kernel.org/doc/Documentation/gpio.txt -* `semver versioning standard `_ \ No newline at end of file +* `semver versioning standard `_ + + +Changes +------- + +Please refer to the `'Changes' section in the documentation `_. diff --git a/VERSION b/VERSION index 78bc1ab..5712157 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.0 +0.10.1 diff --git a/debian/changelog b/debian/changelog index 1699a24..33666c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rpio (0.10.1) unstable; urgency=low + + * Updated debian/control Standards-Version to 3.9.3.1 + + -- Chris Hager Fri, 15 Mar 2013 13:58:49 +0100 + rpio (0.10.0) unstable; urgency=low * Auto-cleanup on exit (also shuts down ``wait_for_interrupts(threaded=True)``) diff --git a/debian/control b/debian/control index 3f80db7..f53790d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Chris Hager Build-Depends: debhelper (>= 8.0.0), python (>= 2.6.6-3~), python3 (>= 3.1.3-12~), python-setuptools, python3-setuptools, python-dev, python3-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.3.1 X-Python-Version: >= 2.6 X-Python3-Version: >= 3.2 Homepage: https://github.com/metachris/RPIO diff --git a/documentation/source/conf.py b/documentation/source/conf.py index e29ede1..3db1c71 100644 --- a/documentation/source/conf.py +++ b/documentation/source/conf.py @@ -48,7 +48,7 @@ # built documents. # # The short X.Y version. -version = '0.10.0' +version = '0.10.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/documentation/source/index.rst b/documentation/source/index.rst index afa4a81..7f149bc 100644 --- a/documentation/source/index.rst +++ b/documentation/source/index.rst @@ -119,6 +119,7 @@ Changes * Bugfix in cpuinfo.c: correctly trim over-voltage header * rpio-curses: help shows raspberry sysinfo * switched argument ordering of wait_for_interrupts to (``wait_for_interrupts(threaded=False, epoll_timeout=1)``) + * Added ``RPIO.Exceptions`` (list of C GPIO exceptions) * v0.9.6 diff --git a/documentation/source/rpio_py.rst b/documentation/source/rpio_py.rst index 06f82ef..bdcbc45 100644 --- a/documentation/source/rpio_py.rst +++ b/documentation/source/rpio_py.rst @@ -51,7 +51,7 @@ or pull-down resistor. * Possible edges are ``rising``, ``falling`` and ``both`` (default). * Possible ``pull_up_down`` values are ``RPIO.PUD_UP``, ``RPIO.PUD_DOWN`` and ``RPIO.PUD_OFF`` (default). * If ``threaded_callback`` is ``True``, the callback will be started inside a thread. Else the callback will block RPIO from waiting for interrupts until it has finished (in the meantime no further callbacks are dispatched). - * If ``debounce_timeout_ms`` is set, interrupt callbacks will not be started until the specified milliseconds have passed since the last interrupt. Adjust this to your needs (typically between 10ms and 100ms). + * If ``debounce_timeout_ms`` is set, interrupt callbacks will not be started until the specified milliseconds have passed since the last interrupt. Adjust this to your needs (typically between 10ms and 1000ms.). The callback receives two arguments: the gpio number and the value (an integer, either ``0`` (Low) or ``1`` (High)). A callback typically looks like this:: diff --git a/fabfile.py b/fabfile.py index aca33bc..d120887 100644 --- a/fabfile.py +++ b/fabfile.py @@ -80,7 +80,7 @@ def build_deb(): run("dpkg-buildpackage -i -I -rfakeroot") -def upload_deb(): +def grab_deb(): # Custom github upload v = _get_cur_version() t = ("/Users/chris/Projects/private/web/metachris.github.com/" @@ -94,7 +94,7 @@ def upload_deb(): print "" print " $ cd %s.." % t print " $ ./gen_version_index.sh %s" % v - print " $ ./gen_index.sh" + print " $ ./gen_index.sh %s" % v print " $ git status" print " $ git add ." print " $ git commit -am 'Debian packages for RPIO %s" % v @@ -180,14 +180,9 @@ def test3_pwm(): # def upload_to_pypi(): """ Upload sdist and bdist_eggs to pypi """ - # DO_UPLOAD provides a safety mechanism to avoid accidental pushes to pypi. - # Set it to "upload" to actually push to pypi; else it only does a dry-run. - DO_UPLOAD = "upload" - # One more safety input and then we are ready to go :) x = prompt("Are you sure to upload the current version to pypi?") if not x or not x.lower() in ["y", "yes"]: - print("Error: no build found in dist/") return local("rm -rf dist") @@ -198,7 +193,7 @@ def upload_to_pypi(): with cd("/tmp"): run("tar -xf /tmp/%s" % fn) with cd("/tmp/RPIO-%s" % version): - run("python2.6 setup.py bdist_egg %s" % DO_UPLOAD) - run("python2.7 setup.py bdist_egg %s" % DO_UPLOAD) - run("python3.2 setup.py bdist_egg %s" % DO_UPLOAD) - local("python setup.py sdist %s" % DO_UPLOAD) + run("python2.6 setup.py bdist_egg upload") + run("python2.7 setup.py bdist_egg upload") + run("python3.2 setup.py bdist_egg upload") + local("python setup.py sdist upload") diff --git a/setup.py b/setup.py index 0e4f825..64b49d2 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ def read(fname): setup( name="RPIO", - version="0.10.0", + version="0.10.1", package_dir={"": "source"}, packages=['RPIO', 'RPIO.PWM'], ext_modules=[ diff --git a/source/RPIO/__init__.py b/source/RPIO/__init__.py index 02262c1..b6de73a 100644 --- a/source/RPIO/__init__.py +++ b/source/RPIO/__init__.py @@ -116,7 +116,7 @@ def socket_callback(socket, val): from RPIO._RPIO import Interruptor -VERSION = "0.10.0" +VERSION = "0.10.1" # Exposing constants from RPi.GPIO VERSION_GPIO = _GPIO.VERSION_GPIO @@ -263,7 +263,7 @@ def cleanup_interrupts(): """ Removes all callbacks and closes used GPIO interfaces and sockets. After this you'll need to re-add the interrupt callbacks before waiting for - interrupts again. Since RPIO v0.10.0 this is done automatically on exit. + interrupts again. Since RPIO v0.10.1 this is done automatically on exit. """ _rpio.cleanup_interrupts() diff --git a/source/c_gpio/py_gpio.c b/source/c_gpio/py_gpio.c index accc775..cbcde94 100644 --- a/source/c_gpio/py_gpio.c +++ b/source/c_gpio/py_gpio.c @@ -540,7 +540,7 @@ PyMODINIT_FUNC init_GPIO(void) rpi_revision_hex = Py_BuildValue("s", revision_hex); PyModule_AddObject(module, "RPI_REVISION_HEX", rpi_revision_hex); - version = Py_BuildValue("s", "0.10.0/0.4.2a"); + version = Py_BuildValue("s", "0.10.1/0.4.2a"); PyModule_AddObject(module, "VERSION_GPIO", version); // set up mmaped areas diff --git a/source/c_pwm/pwm_py.c b/source/c_pwm/pwm_py.c index d57a0af..7a008c1 100644 --- a/source/c_pwm/pwm_py.c +++ b/source/c_pwm/pwm_py.c @@ -245,7 +245,7 @@ PyMODINIT_FUNC init_PWM(void) return; #endif - PyModule_AddObject(module, "VERSION", Py_BuildValue("s", "0.10.0")); + PyModule_AddObject(module, "VERSION", Py_BuildValue("s", "0.10.1")); PyModule_AddObject(module, "DELAY_VIA_PWM", Py_BuildValue("i", DELAY_VIA_PWM)); PyModule_AddObject(module, "DELAY_VIA_PCM", Py_BuildValue("i", DELAY_VIA_PCM)); PyModule_AddObject(module, "LOG_LEVEL_DEBUG", Py_BuildValue("i", LOG_LEVEL_DEBUG)); diff --git a/source/scripts/man/rpio.1 b/source/scripts/man/rpio.1 index 603e34f..f1791eb 100644 --- a/source/scripts/man/rpio.1 +++ b/source/scripts/man/rpio.1 @@ -1,4 +1,4 @@ -.TH "RPIO" "1" "March 14, 2013" "0.10.0" "RPIO" +.TH "RPIO" "1" "March 15, 2013" "0.10.1" "RPIO" .SH NAME rpio \- RPIO Documentation .