Merge branch '37-drop-python-2'

Closes florisla#37

Author: florisla

.travis.yml

@@ -21,9 +21,7 @@ matrix:
       sudo: required  # necessary for Python 3.8?
 
     # Test using nox on non-native Python version 3.6
-    # (nox does not natively run on 2.7 / 3.4)
-    - python: "3.6"
-      env: NOXSESSION="tests-2.7"
+    # (nox does not natively run on 3.4)
     - python: "3.6"
       env: NOXSESSION="tests-3.4"
 

README.md

@@ -12,7 +12,7 @@ ST Microelectronics STM32 microcontrollers over UART.
 Also supports ST BlueNRG devices, and the SweetPeas bootloader
 for Wiznet W7500.
 
-Compatible with Python version 3.4 to 3.8 or 2.7.
+Compatible with Python version 3.4 to 3.8.
 
 
 Usage

noxfile.py

@@ -5,7 +5,7 @@
 import nox
 
 
-@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8"])
+@nox.session(python=["3.4", "3.5", "3.6", "3.7", "3.8"])
 def tests(session):
     """
     Install stm32loader package and execute unit tests.
@@ -19,8 +19,6 @@ def tests(session):
     rmtree("./dist", ignore_errors=True)
     session.install(".")
     session.install("pytest")
-    if session.python == "2.7":
-        session.install("mock")
     session.chdir("tests")
     session.run("pytest", "./")
 

pyproject.toml

@@ -1,9 +1,7 @@
 
 [tool.black]
 line-length = 98
-# not including py27 since that triggers black
-# to change print("") into print ("")
-target-version = ['py34', 'py35', 'py36', 'py37']
+target-version = ['py34', 'py35', 'py36', 'py37', 'py38']
 exclude = '''
 /(
     \.git

setup.cfg

@@ -1,5 +1,5 @@
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [metadata]
 license_file = LICENSE

setup.py

@@ -16,7 +16,7 @@
 URL = 'https://github.com/florisla/stm32loader'
 EMAIL = '[email protected]'
 AUTHOR = 'Floris Lambrechts'
-REQUIRES_PYTHON = '>=2.7.0'
+REQUIRES_PYTHON = '>=3.4.0'
 PROJECT_URLS = {
     "Bug Tracker": "https://github.com/florisla/stm32loader/issues",
     "Source Code": "https://github.com/florisla/stm32loader",
@@ -63,8 +63,6 @@
     classifiers=[
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',

stm32loader/bootloader.py

@@ -20,8 +20,6 @@
 """Talk to an STM32 native bootloader (see ST AN3155)."""
 
 
-from __future__ import print_function
-
 import math
 import operator
 import struct
@@ -291,8 +289,8 @@ def write(self, *data):
 
     def write_and_ack(self, message, *data):
         """Write data to the MCU and wait until it replies with ACK."""
-        # this is a separate method from write() because a keyword
-        # argument after *args is not possible in Python 2
+        # Note: this is a separate method from write() because a keyword
+        # argument after *args was not possible in Python 2
         self.write(*data)
         return self._wait_for_ack(message)
 

stm32loader/main.py

@@ -21,8 +21,6 @@
 """Flash firmware to STM32 microcontrollers over a serial connection."""
 
 
-from __future__ import print_function
-
 import getopt
 import os
 import sys

stm32loader/uart.py

@@ -23,16 +23,13 @@
 Offer support for toggling RESET and BOOT0.
 """
 
-# not naming this file itself 'serial', because that name-clashes in Python 2
+# This file not named 'serial' because that name-clashed in Python 2
 import serial
 
 
-class SerialConnection(object):  # pylint: disable=useless-object-inheritance
+class SerialConnection:
     """Wrap a serial.Serial connection and toggle reset and boot0."""
 
-    # Note: inheriting from object is required for Python2 setters
-    # https://stackoverflow.com/questions/598077/why-does-foo-setter-in-python-not-work-for-me
-
     # pylint: disable=too-many-instance-attributes
 
     def __init__(self, serial_port, baud_rate=115200, parity="E"):

tests/integration/test_stm32loader.py

@@ -121,7 +121,6 @@ def test_erase_resets_memory_to_all_ones(stm32loader, dump_file):
     stm32loader("-e")
     # read all bytes and check if they're 0xFF
     stm32loader("-r", "-l", "1024", dump_file)
-    # bytearray() is required for Python 2
     read_data = bytearray(open(dump_file, "rb").read())
     assert all(byte == 0xFF for byte in read_data)