From 07c8cea4da4031910552b5323adcb9ca8cfbd811 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Wed, 1 Aug 2018 14:21:48 -0400 Subject: [PATCH 1/2] PyPi setup. --- .gitignore | 8 ++++++- .travis.yml | 36 ++++++++++++++-------------- docs/conf.py | 2 +- requirements.txt | 2 +- setup.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 setup.py diff --git a/.gitignore b/.gitignore index e59866c..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +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 4b8587b..c0d8677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,31 @@ -# 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 + 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: jK3ycP/k1bDVwAMqKWlJ4q8LnBtHDahYGLIMqvQhP9wlIB7OaMCjO4V246OuKb2fxZNqodpDtPDvmp+KwOLahA6MBb5jKviFhkUIPa/vQ6jEc93pJWCzUNrygqFz4JK9D/aiF3e7pH6fSJwbfoFJtabfJYWmx539JsL651qn1ew4oPA4s5KT4E8Mm3hraWJrS5ni7rFGgeYpbYkrkxOd1yVUOH0T7V58bSUW996iH9hZ+ghB3jUVJqn4h3TaHI0VZ94PeZhIzcjjTEE0TYJxdV+JI0bfO9TY2Y1CeE7LVTnM2JbWGq3wCehVX6fF3lh5RNLz9ronPnmQJtzeqcLTG20Q8mhvQEvBYJs+uMJyQt5DqFWBmFitxnSxRCv7cZ/AIntDBsgE854Qe7ldMFCxo4yxPgQU0n4Li3DvlnYfhWrb8liTf68X/OABslLz+XR6kcOtg3W8ykWqMnw6Kia99QLEgCGdWlYYDLvo1wLT0/izxV7bfFF32z8ZMLn6YhkpjS4pPBMdwKHF5Vywo7QDVeoGUGnqjcDHhOBoUs8avSwQG0ek7iKHfyMSdHdq1fCZ0BgxcP6s6aXGdGLvV80Bam0H0rFN6dFIxwei5+t+WHIDx5Gn9WHWDmRNl3Fr4Aj7D5/WVwYFaxQsS4MVKFu4hzYs84s8qloJ6V1M31+Y9Xc= 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 script: - - pylint adafruit_ccs811.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ccs811 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_ccs811.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ccs811 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/docs/conf.py b/docs/conf.py index 4c29981..8be4d58 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -39,7 +39,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", "adafruit_bus_device", "adafruit_register"] +# autodoc_mock_imports = ["micropython", "adafruit_bus_device", "adafruit_register"] 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 1e788f1..b6a7c61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ adafruit-circuitpython-register -adafruit-circuitpython-bus-device>=0.2.0 +adafruit-circuitpython-busdevice diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..cd7a6e6 --- /dev/null +++ b/setup.py @@ -0,0 +1,61 @@ +"""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-ccs811', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for CCS811 air quality sensor.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_AMG88xx', + + # Author details + author='Adafruit Industries', + author_email='circuitpython@adafruit.com', + + install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-register', + '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 air quality voc eco2 temperature 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_ccs811'], +) \ No newline at end of file From b258b428153ebc221dfc4a829bf4a385ee5861d2 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Wed, 1 Aug 2018 14:24:29 -0400 Subject: [PATCH 2/2] Updated project url --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cd7a6e6..6b1c269 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ long_description_content_type='text/x-rst', # The project's main homepage. - url='https://github.com/adafruit/Adafruit_CircuitPython_AMG88xx', + url='https://github.com/adafruit/Adafruit_CircuitPython_CCS811', # Author details author='Adafruit Industries',