Skip to content

Commit 1ae2d2f

Browse files
authored
Merge pull request #10 from kattni/pypi-fix
Fixed travis.yml, busdevice
2 parents 372613c + e0b5b77 commit 1ae2d2f

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ python:
66
cache:
77
pip: true
88
deploy:
9-
provider: releases
9+
- provider: releases
1010
api_key: "$GITHUB_TOKEN"
1111
file_glob: true
1212
file: "$TRAVIS_BUILD_DIR/bundles/*"
@@ -23,6 +23,7 @@ deploy:
2323
install:
2424
- pip install -r requirements.txt
2525
- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme
26+
- pip install --force-reinstall pylint==1.9.2
2627
script:
2728
- pylint adafruit_featherwing/*.py
2829
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/**/*.py)

adafruit_featherwing/joy_featherwing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
__version__ = "0.0.0-auto.0"
3232
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing.git"
3333

34+
from micropython import const
3435
import adafruit_seesaw.seesaw
3536
from adafruit_featherwing import shared
36-
from micropython import const
3737

3838
BUTTON_A = const(1 << 6)
3939
BUTTON_B = const(1 << 7)

docs/api.rst

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1+
FeatherWing Modules
2+
-------------------
13

24
.. If you created a package, create one automodule per module in the package.
35
46
.. automodule:: adafruit_featherwing.motor_featherwing
7+
:members:
8+
59
.. automodule:: adafruit_featherwing.ina219_featherwing
10+
:members:
11+
612
.. automodule:: adafruit_featherwing.joy_featherwing
713
:members:

docs/conf.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@
1818
# Uncomment the below if you use native CircuitPython modules such as
1919
# digitalio, micropython and busio. List the modules you use. Without it, the
2020
# autodoc module docs will fail to generate with a warning.
21+
autodoc_mock_imports = ["adafruit_featherwing"]
2122

2223
intersphinx_mapping = {
2324
'python': ('https://docs.python.org/3.4', None),
2425
'BusDevice': ('https://circuitpython.readthedocs.io/projects/bus_device/en/latest/', None),
2526
'Register': ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None),
2627
'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None),
27-
'motor': ('https://circuitpython.readthedocs.io/projects/motor/en/latest/', None)}
28+
'motor': ('https://circuitpython.readthedocs.io/projects/motor/en/latest/', None),
29+
'seesaw': ('https://circuitpython.readthedocs.io/projects/seesaw/en/latest/', None),
30+
'INA219': ('https://circuitpython.readthedocs.io/projects/ina219/en/latest/', None)}
2831

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

3740
# General information about the project.
38-
project = u'Adafruit featherwing Library'
41+
project = u'Adafruit Featherwing Library'
3942
copyright = u'2017 Scott Shawcroft'
40-
author = u'Scott Shawcroft'
43+
author = u'Scott Shawcroft, Kattni Rembor'
4144

4245
# The version info for the project you're documenting, acts as replacement for
4346
# |version| and |release|, also used in various other places throughout the

docs/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Table of Contents
2626
.. toctree::
2727
:caption: Related Products
2828

29-
Adafruit Feather Wings <https://www.adafruit.com/category/945>
29+
Adafruit FeatherWings <https://www.adafruit.com/category/945>
3030

3131
.. toctree::
3232
:caption: Other Links

requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Adafruit-Blinka
2-
adafruit-circuitpython-bus-device
2+
adafruit-circuitpython-busdevice
33
adafruit-circuitpython-register
4-
adafruit-circuitpython-pca9685
54
adafruit-circuitpython-motor
6-
adafruit-ina219
5+
adafruit-circuitpython-ina219
76
adafruit-seesaw
7+
adafruit-circuitpython-pca9685

0 commit comments

Comments
 (0)