From d31750a2744e4569dada92ff34be7005fe2faf84 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Sun, 5 Aug 2018 16:46:09 -0400 Subject: [PATCH 1/2] PyPi setup. --- .gitignore | 7 +++++- .travis.yml | 38 ++++++++++++++-------------- adafruit_max31865.py | 8 +++--- docs/conf.py | 2 +- requirements.txt | 3 ++- setup.py | 60 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 93 insertions(+), 25 deletions(-) create mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 6337ada..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ +*.mpy +.idea __pycache__ _build *.pyc -*.mpy .env build* bundles +*.DS_Store +.eggs +dist +**/*.egg-info \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9fa9b2b..8cbe234 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,32 @@ -# This is a common .travis.yml for generating library release zip files for -# CircuitPython library releases using circuitpython-build-tools. -# See https://github.com/adafruit/circuitpython-build-tools for detailed setup -# instructions. - dist: trusty sudo: false language: python python: - - "3.6" - +- '3.6' cache: - pip: true - + pip: true deploy: - provider: releases - api_key: $GITHUB_TOKEN +- provider: releases + api_key: "$GITHUB_TOKEN" file_glob: true - file: $TRAVIS_BUILD_DIR/bundles/* + file: "$TRAVIS_BUILD_DIR/bundles/*" skip_cleanup: true overwrite: true on: tags: true - +- provider: pypi + user: adafruit-travis + on: + tags: true + password: + secure: YuVU1r8L2bgMcgL34DibaudiCVZANqt21sapSiNJH/o3GNXEqUy91jworFdV3B+UAws4goRikjsCtZDSkPvj7eXtEk7+skyOAzXH/iLSvXPgcuHU63FZwfYy0l0CSVoAUrjtCpkK13MvPDfQThnuu58n+Kt248RaVlUSQxoV+3OSw8ssjRPr2zb2ooVi/SqBwHsem7PHWBiYTgQyeJEpEXEoppI+Q5Fn0H5U9N3Q3yP8HpCLdCRwMpnXLNuW06ALwWkAus5Y204r55hyK/i0pHEJURNkdsQEAbbnwNc8MfWWlcvvACMhuon01ucOdwyLT9EbslyhnKQrgy/oqMOPTwIPzFIVeNSbvxZgHAVhjCEQlSnvL2+LWZioT07/pRhE4/DAtQQGbv2TEt1X6McqviDX795pLObO90q0+wHwSUHDpeoi/oiI1znUvzO/cWxOKc/CRWNSJt/9Vh8zRmU4SqliHz1SHTifei1n0e4t77vQBpDdWCJJL2u2JkF92hPVjQywGL/N8LB1/RlVEEJVolpIARI8nyvw6GsmQLfe9BsW5PDa/9oKhhXlTicUEsKgnE5vJcf95jGM5Lp+37+FD4vHdZS2ssXL+QwbFOu/9br0+ZJS+f1qNtSKOXBqkuejWhrinTCVMuqkL/D84/kUxwLlKgmm2u94AURj7H8OzKI= install: - - pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme - +- pip install -r requirements.txt +- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme +- pip install --force-reinstall pylint==1.9.2 script: - - pylint adafruit_max31865.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-max31865 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html \ No newline at end of file +- pylint adafruit_max31865.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-max31865 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/adafruit_max31865.py b/adafruit_max31865.py index cdac0f4..036eaa3 100644 --- a/adafruit_max31865.py +++ b/adafruit_max31865.py @@ -53,7 +53,7 @@ import time from micropython import const -import adafruit_bus_device.spi_device as spi_device +import adafruit_bus_device.spi_device as spi_dev #pylint: disable=bad-whitespace @@ -97,8 +97,8 @@ class MAX31865: def __init__(self, spi, cs, *, rtd_nominal=100, ref_resistor=430.0, wires=2): self.rtd_nominal = rtd_nominal self.ref_resistor = ref_resistor - self._device = spi_device.SPIDevice(spi, cs, baudrate=500000, - polarity=0, phase=1) + self._device = spi_dev.SPIDevice(spi, cs, baudrate=500000, + polarity=0, phase=1) # Set wire config register based on the number of wires specified. if wires not in (2, 3, 4): raise ValueError('Wires must be a value of 2, 3, or 4!') @@ -113,6 +113,7 @@ class MAX31865: self.bias = False self.auto_convert = False + # pylint: disable=no-member def _read_u8(self, address): # Read an 8-bit unsigned value from the specified 8-bit address. with self._device as device: @@ -135,6 +136,7 @@ class MAX31865: self._BUFFER[0] = (address | 0x80) & 0xFF self._BUFFER[1] = val & 0xFF device.write(self._BUFFER, end=2) + # pylint: enable=no-member @property def bias(self): diff --git a/docs/conf.py b/docs/conf.py index 7e6ef2b..2e96f1c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,7 +19,7 @@ extensions = [ # Uncomment the below if you use native CircuitPython modules such as # digitalio, micropython and busio. List the modules you use. Without it, the # autodoc module docs will fail to generate with a warning. -autodoc_mock_imports = ["micropython", "adafruit_bus_device"] +# autodoc_mock_imports = ["micropython", "adafruit_bus_device"] intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} diff --git a/requirements.txt b/requirements.txt index c47d35a..3031961 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -adafruit-circuitpython-bus-device +Adafruit-Blinka +adafruit-circuitpython-busdevice diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..4b90dbd --- /dev/null +++ b/setup.py @@ -0,0 +1,60 @@ +"""A setuptools based setup module. + +See: +https://packaging.python.org/en/latest/distributing.html +https://github.com/pypa/sampleproject +""" + +# Always prefer setuptools over distutils +from setuptools import setup, find_packages +# To use a consistent encoding +from codecs import open +from os import path + +here = path.abspath(path.dirname(__file__)) + +# Get the long description from the README file +with open(path.join(here, 'README.rst'), encoding='utf-8') as f: + long_description = f.read() + +setup( + name='adafruit-circuitpython-max31865', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for MAX31865 thermocouple amplifier.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_MAX31865', + + # Author details + author='Adafruit Industries', + author_email='circuitpython@adafruit.com', + + install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice'], + + # Choose your license + license='MIT', + + # See https://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'Topic :: Software Development :: Libraries', + 'Topic :: System :: Hardware', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + ], + + # What does your project relate to? + keywords='adafruit max31865 thermocouple amplifier breakout hardware micropython circuitpython', + + # You can just specify the packages manually here if your project is + # simple. Or you can use find_packages(). + py_modules=['adafruit_max31865'], +) From ddbaf5d6475a756aa501540e3f9c4af0ce059326 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Mon, 6 Aug 2018 12:36:28 -0400 Subject: [PATCH 2/2] refactor to original state --- adafruit_max31865.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_max31865.py b/adafruit_max31865.py index 036eaa3..4209cd1 100644 --- a/adafruit_max31865.py +++ b/adafruit_max31865.py @@ -53,7 +53,7 @@ import time from micropython import const -import adafruit_bus_device.spi_device as spi_dev +import adafruit_bus_device.spi_device as spi_device #pylint: disable=bad-whitespace @@ -97,8 +97,8 @@ class MAX31865: def __init__(self, spi, cs, *, rtd_nominal=100, ref_resistor=430.0, wires=2): self.rtd_nominal = rtd_nominal self.ref_resistor = ref_resistor - self._device = spi_dev.SPIDevice(spi, cs, baudrate=500000, - polarity=0, phase=1) + self._device = spi_device.SPIDevice(spi, cs, baudrate=500000, + polarity=0, phase=1) # Set wire config register based on the number of wires specified. if wires not in (2, 3, 4): raise ValueError('Wires must be a value of 2, 3, or 4!')