Merge pull request #187 from rhempel/feature-python3-migrate

Feature python3 migrate

Author: rhempel

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-- 2.7
+- 3.4
 sudo: false
 install:
 - pip install Pillow

README.rst

@@ -7,19 +7,19 @@ Python language bindings for ev3dev
     :target: http://python-ev3dev.readthedocs.org/en/latest/?badge=latest
     :alt: Documentation Status
 
-A Python library implementing unified interface for ev3dev_ devices.
+A Python3 library implementing unified interface for ev3dev_ devices.
 
 Example Code
 ------------
 
-To run these minimal examples, run the Python interpreter from
+To run these minimal examples, run the Python3 interpreter from
 the terminal like this: 
 
 .. code-block:: bash
 
-  robot@ev3dev:~$ python
-  Python 2.7.9 (default, Mar  1 2015, 13:52:09) 
-  [GCC 4.9.2] on linux2
+  robot@ev3dev:~/ev3dev-lang-python$ python3
+  Python 3.4.2 (default, Oct  8 2014, 14:47:30) 
+  [GCC 4.9.1] on linux
   Type "help", "copyright", "credits" or "license" for more information.
   >>>
 
@@ -46,18 +46,18 @@ loop and start the program.  Hit ``Ctrl-C`` to exit the loop.
       ev3.Leds.set_color(ev3.Leds.LEFT, (ev3.Leds.GREEN, ev3.Leds.RED)[ts.value()])
   
 Now plug a motor into the ``A`` port and paste this code into the terminal. This
-little program will run the motor at 75% power for 3 seconds.
+little program will run the motor at 500 RPM for 3 seconds.
 
 .. code-block:: python
 
   m = ev3.LargeMotor('outA')
-  m.run_timed(time_sp=3000, duty_cycle_sp=75)
+  m.run_timed(time_sp=3000, speed_sp=500)
 
 If you want to make your robot speak, then paste this code into the terminal:
 
 .. code-block:: python
 
-  ev3.Sound.speak('Welcome to the EV3DEV project!').wait()
+  ev3.Sound.speak('Welcome to the E V 3 dev project!').wait()
 
 To quit Python, just type ``exit()`` or ``Ctrl-D``.
 
@@ -109,20 +109,14 @@ The ev3dev-lang Project on GitHub
 Python2.x and Python3.x Compatibility
 -------------------------------------
 
-The ev3dev_ distribution comes with both python2_ and python3_ installed and
-this library is compatible with both versions.
+The ev3dev_ distribution comes with both python2_ and python3_ installed
+but this library is compatible only with Python3.
 
-Note that currently, the source is only installed in the default
-`Python 2.x`_ location - this will be addressed in the next package we
+Note that currently, the Python3 binding for ev3dev_ is not installed
+by default - this will be addressed in the next package we
 release.
 
-For `Python 2.x`_ programs, you import the binding like this:
-
-.. code-block:: python
-
-  from ev3dev.auto import *
-
-For `Python 3.x`_ the easiest way to work around the problem is
+The easiest way to work around the problem is
 to get your EV3 connected to the Internet and then:
 
 #. Update the package lists

debian/changelog

@@ -1,3 +1,11 @@
+python-ev3dev (0.7.0~rc1) stable; urgency=medium
+
+  * Drop python 2.x support.
+  * Performance improvements for reading/writing sysfs attributes.
+  * Updates for breaking ev3dev kernel changes.
+
+ -- David Lechner <[email protected]>  Mon, 25 Jul 2016 21:13:43 -0500
+
 python-ev3dev (0.6.0) stable; urgency=medium
 
   [Ralph Hempel]

debian/control

@@ -3,13 +3,13 @@ Maintainer: Ralph Hempel <[email protected]>
 Section: python
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-python
+Build-Depends: python3-setuptools (>= 0.6b3), python3-all (>= 3.4), debhelper (>= 9), dh-python
 VCS-Git: git://github.com/rhempel/ev3dev-lang-python.git
 VCS-Browser: https://github.com/rhempel/ev3dev-lang-python
 
-Package: python-ev3dev
+Package: python3-ev3dev
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Python language bindings for ev3dev
  This package is a pure Python binding to the peripheral
  devices on hardware that is supported by ev3dev.org - a

debian/copyright

@@ -1,10 +1,10 @@
 Files: debian/*
 License: MIT
-Copyright: 2015 Ralph Hempel <[email protected]>
+Copyright: 2016 Ralph Hempel <[email protected]>
 
 Files: *
 License: MIT
-Copyright: 2015 Ralph Hempel <[email protected]>
+Copyright: 2016 Ralph Hempel <[email protected]>
 Copyright: 2015 Denis Demidov <[email protected]>
 Copyright: 2015 Eric Pascual <[email protected]>
 Copyright: 2015 Anton Vanhoucke <[email protected]>

debian/rules

@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=python-ev3dev
+export PYBUILD_NAME=python3-ev3dev
 
-VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1,p')
+VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1,p' | sed 's,~,,')
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_configure:
-	echo VERSION > RELEASE-VERSION
+	echo $(VERSION) > RELEASE-VERSION
 	dh_auto_configure
 
 override_dh_auto_clean:
-	echo VERSION > RELEASE-VERSION
+	echo $(VERSION) > RELEASE-VERSION
 	dh_auto_clean
 	rm -f RELEASE-VERSION

ev3dev-lang

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # The MIT License (MIT)
 #
 # Copyright (c) 2016 Laurens Valk ([email protected])
@@ -294,8 +294,8 @@ def shutdown():
             ## Calibrate Gyro
             ##
             ########################################################################
-            print "-----------------------------------"
-            print "Calibrating..."
+            print("-----------------------------------")
+            print("Calibrating...")
 
             #As you hold the robot still, determine the average sensor value of 100 samples
             gyroRateCalibrateCount = 100
@@ -305,10 +305,10 @@ def shutdown():
             gyroOffset = gyroOffset/gyroRateCalibrateCount
 
             # Print the result
-            print "GyroOffset: %s" % gyroOffset
-            print "-----------------------------------"
-            print "GO!"
-            print "-----------------------------------"
+            print("GyroOffset: %s" % gyroOffset)
+            print("-----------------------------------")
+            print("GO!")
+            print("-----------------------------------")
 
             ########################################################################
             ##

ev3dev/GyroBalancer.py

@@ -2,6 +2,7 @@
 
 # -----------------------------------------------------------------------------
 # Guess platform we are running on
+
 def current_platform():
     machine = platform.machine()
     if machine == 'armv5tejl':
@@ -11,6 +12,8 @@ def current_platform():
     else:
         return 'unsupported'
 
+# -----------------------------------------------------------------------------
+
 if current_platform() == 'brickpi':
     from .brickpi import *
 else: