Skip to content

Fix packaging #64

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.

Sign up for GitHub

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 5 commits into from
Jan 21, 2020
Merged

Fix packaging #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e8fc0d
Remove board import. It isn't used.
tannewt Jan 21, 2020
656e503
Ignore python build output.
tannewt Jan 21, 2020
4fb04ed
Use find_packages to find subpackages.
tannewt Jan 21, 2020
d6993c4
Remove use of mocks for sphinx. Blinka should be enough.
tannewt Jan 21, 2020
d99232a
Mock microcontroller so we don't use Blinka's board detect.
tannewt Jan 21, 2020
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ _build
.env
bundles
.DS_Store
.eggs
*.egg-info
build
dist
1 change: 0 additions & 1 deletion adafruit_ble/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"This release is not compatible with CircuitPython 4.x; use library release 1.x.x")
#pylint: enable=wrong-import-position

import board
import _bleio

from .services import Service
Expand Down
3 changes: 1 addition & 2 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os
import sys
sys.path.insert(0, os.path.abspath('..'))
sys.path.insert(0, os.path.abspath('mocks'))

# -- General configuration ------------------------------------------------

Expand All @@ -21,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 = ["board"]
autodoc_mock_imports = ["board", "microcontroller"]
autodoc_member_order = "bysource"
add_module_names = False

Expand Down
20 changes: 0 additions & 20 deletions docs/mocks/_bleio.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion docs/mocks/microcontroller.py
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions docs/mocks/micropython.py
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,5 @@
# What does your project relate to?
keywords='adafruit blinka circuitpython micropython ble bluetooth',

# You can just specify the packages manually here if your project is
# simple. Or you can use find_packages().
# TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER,
# CHANGE `py_modules=['...']` TO `packages=['...']`
packages=['adafruit_ble'],
packages=find_packages(include=["adafruit_ble.*"]),
)