Skip to content

Commit f4fed44

Browse files
authored
Merge pull request #10 from kattni/pypi
PyPi setup.
2 parents ef2beef + cf7e728 commit f4fed44

File tree

7 files changed

+97
-24
lines changed

7 files changed

+97
-24
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
*.mpy
2+
.idea
13
__pycache__
24
_build
35
*.pyc
4-
*.mpy
56
.env
67
build*
78
bundles
9+
*.DS_Store
10+
.eggs
11+
dist
12+
**/*.egg-info

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local
155155
# (useful for modules/projects where namespaces are manipulated during runtime
156156
# and thus existing member attributes cannot be deduced by static analysis. It
157157
# supports qualified module names, as well as Unix pattern matching.
158-
ignored-modules=
158+
ignored-modules=board
159159

160160
# Show a hint with possible names when a member name was not found. The aspect
161161
# of finding the hint is based on edit distance.

.travis.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
# This is a common .travis.yml for generating library release zip files for
2-
# CircuitPython library releases using circuitpython-build-tools.
3-
# See https://github.com/adafruit/circuitpython-build-tools for detailed setup
4-
# instructions.
5-
61
dist: trusty
72
sudo: false
83
language: python
94
python:
10-
- "3.6"
11-
5+
- '3.6'
126
cache:
13-
pip: true
14-
7+
pip: true
158
deploy:
16-
provider: releases
17-
api_key: $GITHUB_TOKEN
9+
- provider: releases
10+
api_key: "$GITHUB_TOKEN"
1811
file_glob: true
19-
file: $TRAVIS_BUILD_DIR/bundles/*
12+
file: "$TRAVIS_BUILD_DIR/bundles/*"
2013
skip_cleanup: true
2114
overwrite: true
2215
on:
2316
tags: true
24-
17+
- provider: pypi
18+
user: adafruit-travis
19+
on:
20+
tags: true
21+
password:
22+
secure: f3THVFaLhKUStaYcrl2KQxXf/60ucgQ/UmK5jmKtRqjduWc1hHBi3hepyOAwqvcSW1TLD0rBxW6Y+Ny1dgv0XMv3kVzfa6u/7YCvRC1jaHiJrLqNu//HiX3ExM3phiptnH9yYD4dp3QvaVviB6Fxal3iLs4NwHhpHis/7Ky3QpywX7CPxOka9U4pSjsNLtSZbPDdZKJnHzAyk9crG+NxHWeuWQB/3tUFKOT5AfYY4aJ+uzmFxK7ykleAZsOG1Kmt770Pua8zqN5O2DcbVOScQ32eviLJJSPzEHSOmtQkqE5BjImPXmWEMzcHgSmOuwL5rTfWAVAiIbJY5eYtT6CJAV2ttRMuDJnTaZ/mnOCWHDJqDVNgWihxyYvaN/Sra/nkURziW8+ROOR9pSfL0CZOdEFWUoHMuKiJ/RFF4W0pXji9y4tqYm5xUUSkEfb6MTPtYu16mm+nPSsX2jJOryVdGhWZo3JYgj4AK61G91ilHtfhbLveWWZvg8S+oKrf2xddHBfE8XxyGhM1108AGximwXMM8lEqEKYE7gV7hIP5hLTE4iwW4Ckbib7ERS9X0Z1o7uenHb54Q+gb3kTcSPtEdSyeJgMqTI+Hq0rz5VO8dd0QQX6ybCQxcHOF9yPPVca4ekaTwiY+vxV+s31E8sKJVhETD91TVqvT7PGq2oKEHyI=
2523
install:
26-
- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme
27-
24+
- pip install -r requirements.txt
25+
- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme
26+
- pip install --force-reinstall pylint==1.9.2
2827
script:
29-
- pylint adafruit_sdcard.py
30-
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
31-
- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-sd --library_location .
32-
- cd docs && sphinx-build -E -W -b html . _build/html
28+
- pylint adafruit_sdcard.py
29+
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
30+
- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-sd --library_location
31+
.
32+
- cd docs && sphinx-build -E -W -b html . _build/html && cd ..

adafruit_sdcard.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ def _wait_for_ready(self, spi, timeout=0.3):
214214
while time.monotonic() - start_time < timeout and self._single_byte[0] != 0xff:
215215
spi.readinto(self._single_byte, write_value=0xff)
216216

217-
#pylint: disable-msg=too-many-arguments
217+
# pylint: disable-msg=too-many-arguments
218+
# pylint: disable=no-member
219+
# no-member disable should be reconsidered when it can be tested
218220
def _cmd(self, cmd, arg=0, crc=0, response_buf=None, data_block=True, wait=True):
219221
"""
220222
Issue a command to the card and read an optional data response.
@@ -294,6 +296,8 @@ def _block_cmd(self, cmd, block, crc, response_buf=None):
294296
result = buf[0]
295297
break
296298

299+
# pylint: disable=singleton-comparison
300+
# Disable should be removed when refactor can be tested.
297301
if response_buf != None and result == 0:
298302
self._readinto(response_buf)
299303

@@ -362,6 +366,8 @@ def _write(self, token, buf, start=0, end=None):
362366
spi.write(cmd, end=2)
363367

364368
# check the response
369+
# pylint: disable=no-else-return
370+
# Disable should be removed when refactor can be tested
365371
for _ in range(_CMD_TIMEOUT):
366372
spi.readinto(cmd, end=1, write_value=0xff)
367373
if not (cmd[0] & 0x80):

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
]
1717

1818

19-
autodoc_mock_imports = ["adafruit_bus_device", "micropython"]
19+
# autodoc_mock_imports = ["adafruit_bus_device", "micropython"]
2020

2121
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),
2222
'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
adafruit-circuitpython-bus-device
1+
Adafruit-Blinka
2+
adafruit-circuitpython-busdevice

setup.py

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
"""A setuptools based setup module.
2+
3+
See:
4+
https://packaging.python.org/en/latest/distributing.html
5+
https://github.com/pypa/sampleproject
6+
"""
7+
8+
# Always prefer setuptools over distutils
9+
from setuptools import setup, find_packages
10+
# To use a consistent encoding
11+
from codecs import open
12+
from os import path
13+
14+
here = path.abspath(path.dirname(__file__))
15+
16+
# Get the long description from the README file
17+
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
18+
long_description = f.read()
19+
20+
setup(
21+
name='adafruit-circuitpython-sd',
22+
23+
use_scm_version=True,
24+
setup_requires=['setuptools_scm'],
25+
26+
description='CircuitPython library for SD cards.',
27+
long_description=long_description,
28+
long_description_content_type='text/x-rst',
29+
30+
# The project's main homepage.
31+
url='https://github.com/adafruit/Adafruit_CircuitPython_SD',
32+
33+
# Author details
34+
author='Adafruit Industries',
35+
author_email='[email protected]',
36+
37+
install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice'],
38+
39+
# Choose your license
40+
license='MIT',
41+
42+
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
43+
classifiers=[
44+
'Development Status :: 3 - Alpha',
45+
'Intended Audience :: Developers',
46+
'Topic :: Software Development :: Libraries',
47+
'Topic :: System :: Hardware',
48+
'License :: OSI Approved :: MIT License',
49+
'Programming Language :: Python :: 3',
50+
'Programming Language :: Python :: 3.4',
51+
'Programming Language :: Python :: 3.5',
52+
],
53+
54+
# What does your project relate to?
55+
keywords='adafruit sdcard sd card mount storage featherwing adalogger'
56+
'breakout hardware micropython circuitpython',
57+
58+
# You can just specify the packages manually here if your project is
59+
# simple. Or you can use find_packages().
60+
py_modules=['adafruit_sdcard'],
61+
)

0 commit comments

Comments
 (0)