From 9b990c5e5eeda44056e3b7033f7b5a8156a4d131 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Tue, 2 Oct 2018 15:28:21 -0400 Subject: [PATCH 1/3] PyPi setup. --- .gitignore | 7 +++++- .travis.yml | 39 +++++++++++++++---------------- docs/conf.py | 2 +- requirements.txt | 1 + setup.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 22 deletions(-) create mode 100644 setup.py diff --git a/.gitignore b/.gitignore index daac230..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ +*.mpy +.idea __pycache__ _build *.pyc .env build* bundles -.vscode \ No newline at end of file +*.DS_Store +.eggs +dist +**/*.egg-info \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3aea788..fbba3a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +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: ZKJwRfyZaLluMqius93GaEIHUVbQbk6fZ9NF/yFUJO7miTd2rgEjG611LupE64HqIEQRbWd9KwwGTzDQ7q7yxq4LiMJDi0/btqfvT2aAbo9tzTyTVkg1QFoOf/OaRw01h80i7FDxf4yfr1cVi2hq7QKSihkB4PXnLCJjuJMQ64Uz8zSpZ2KSjoMEb87RccCp+NIefq58s6dHgVP58GT/T+YFgh5RlBVvjHXvbG7VvNqqQeLz8AefPx04O3mbCBSlifCli6hDlU6bYcsxLPsjBrNG36b3EcisY6QX59KapaBx35iBx/KkNlKbv13xOIn5DI7vNiErsZ/T53c5li64GhF2bJT7e0Bf2gwjTSNMZ0ZWbqR/PGUfT+tAINA8wAHaKwLK71esEb75LkDtp6YAFt5JmjD3BFJT8Fn834o1hjk+hbYwptTL8Q6+2TqStQ6mwTy3BccyUYW9s10KwPgN/BhBJk7dC6UGwNUKxd11vzK7kGfy0D87wwQg/eGiV3bPtAKJI+7jSzFUjihGUOcbz3uxCaMtgxFUPJha2ViKPG6SXn1I5iW2iokm9Ot4mxmFouMiRrirDEGzppseiHO3ryb/yKkCllEb0kx3Mcos/nfujO+nD9+DAuzrnNzlIbcwDJ4noVZrnX3Fe8RS8oII/sGW3XXEzp0jBXaSpsourN8= install: - - pip install circuitpython-build-tools Sphinx sphinx-rtd-theme - - pip install --force-reinstall pylint==1.9.2 - +- pip install circuitpython-build-tools Sphinx sphinx-rtd-theme +- pip install --force-reinstall pylint==1.9.2 script: - - pylint adafruit_tca9548a.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-tca9548a --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_tca9548a.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace + examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-tca9548a --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html diff --git a/docs/conf.py b/docs/conf.py index 9704fb2..3a7ccd5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ # 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"] +# autodoc_mock_imports = ["micropython"] intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'Register': ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} diff --git a/requirements.txt b/requirements.txt index e69de29..6b4e64a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1 @@ +Adafruit-Blinka \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..d88e881 --- /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-tca9548a', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython driver for the TCA9548A I2C Multiplexer.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_TCA9548A', + + # Author details + author='Adafruit Industries', + author_email='circuitpython@adafruit.com', + + install_requires=['Adafruit-Blinka'], + + # 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 tca9548a i2c multiplexer 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_tca9548a'], +) From 1c6f918e959694c2eb922e834c3e8a51ba781a5e Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Tue, 2 Oct 2018 15:29:40 -0400 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fbba3a1..f849b86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,4 +29,4 @@ script: examples/*.py) - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-tca9548a --library_location . -- cd docs && sphinx-build -E -W -b html . _build/html +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. From 894880dbec84874be0b0c183c13aaece5cded405 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Tue, 2 Oct 2018 15:34:38 -0400 Subject: [PATCH 3/3] install req.txt fix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f849b86..6691927 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ deploy: password: secure: ZKJwRfyZaLluMqius93GaEIHUVbQbk6fZ9NF/yFUJO7miTd2rgEjG611LupE64HqIEQRbWd9KwwGTzDQ7q7yxq4LiMJDi0/btqfvT2aAbo9tzTyTVkg1QFoOf/OaRw01h80i7FDxf4yfr1cVi2hq7QKSihkB4PXnLCJjuJMQ64Uz8zSpZ2KSjoMEb87RccCp+NIefq58s6dHgVP58GT/T+YFgh5RlBVvjHXvbG7VvNqqQeLz8AefPx04O3mbCBSlifCli6hDlU6bYcsxLPsjBrNG36b3EcisY6QX59KapaBx35iBx/KkNlKbv13xOIn5DI7vNiErsZ/T53c5li64GhF2bJT7e0Bf2gwjTSNMZ0ZWbqR/PGUfT+tAINA8wAHaKwLK71esEb75LkDtp6YAFt5JmjD3BFJT8Fn834o1hjk+hbYwptTL8Q6+2TqStQ6mwTy3BccyUYW9s10KwPgN/BhBJk7dC6UGwNUKxd11vzK7kGfy0D87wwQg/eGiV3bPtAKJI+7jSzFUjihGUOcbz3uxCaMtgxFUPJha2ViKPG6SXn1I5iW2iokm9Ot4mxmFouMiRrirDEGzppseiHO3ryb/yKkCllEb0kx3Mcos/nfujO+nD9+DAuzrnNzlIbcwDJ4noVZrnX3Fe8RS8oII/sGW3XXEzp0jBXaSpsourN8= install: +- pip install -r requirements.txt - pip install circuitpython-build-tools Sphinx sphinx-rtd-theme - pip install --force-reinstall pylint==1.9.2 script: