Skip to content

Revert "Fixed travis.yml, busdevice" #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ python:
cache:
pip: true
deploy:
- provider: releases
provider: releases
api_key: "$GITHUB_TOKEN"
file_glob: true
file: "$TRAVIS_BUILD_DIR/bundles/*"
Expand All @@ -23,7 +23,6 @@ deploy:
install:
- 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_featherwing/*.py
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/**/*.py)
Expand Down
2 changes: 1 addition & 1 deletion adafruit_featherwing/joy_featherwing.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
__version__ = "0.0.0-auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git"

from micropython import const
import adafruit_seesaw.seesaw
from adafruit_featherwing import shared
from micropython import const

BUTTON_A = const(1 << 6)
BUTTON_B = const(1 << 7)
Expand Down
6 changes: 0 additions & 6 deletions docs/api.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
FeatherWing Modules
-------------------

.. If you created a package, create one automodule per module in the package.

.. automodule:: adafruit_featherwing.motor_featherwing
:members:

.. automodule:: adafruit_featherwing.ina219_featherwing
:members:

.. automodule:: adafruit_featherwing.joy_featherwing
:members:
9 changes: 3 additions & 6 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@
# 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 = ["adafruit_featherwing"]

intersphinx_mapping = {
'python': ('https://docs.python.org/3.4', None),
'BusDevice': ('https://circuitpython.readthedocs.io/projects/bus_device/en/latest/', None),
'Register': ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None),
'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None),
'motor': ('https://circuitpython.readthedocs.io/projects/motor/en/latest/', None),
'seesaw': ('https://circuitpython.readthedocs.io/projects/seesaw/en/latest/', None),
'INA219': ('https://circuitpython.readthedocs.io/projects/ina219/en/latest/', None)}
'motor': ('https://circuitpython.readthedocs.io/projects/motor/en/latest/', None)}

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand All @@ -38,9 +35,9 @@
master_doc = 'index'

# General information about the project.
project = u'Adafruit Featherwing Library'
project = u'Adafruit featherwing Library'
copyright = u'2017 Scott Shawcroft'
author = u'Scott Shawcroft, Kattni Rembor'
author = u'Scott Shawcroft'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Table of Contents
.. toctree::
:caption: Related Products

Adafruit FeatherWings <https://www.adafruit.com/category/945>
Adafruit Feather Wings <https://www.adafruit.com/category/945>

.. toctree::
:caption: Other Links
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Adafruit-Blinka
adafruit-circuitpython-busdevice
adafruit-circuitpython-bus-device
adafruit-circuitpython-register
adafruit-circuitpython-pca9685
adafruit-circuitpython-motor
adafruit-circuitpython-ina219
adafruit-ina219
adafruit-seesaw
adafruit-circuitpython-pca9685