Skip to content

Commit a65f184

Browse files
authored
Merge pull request #10 from fourstix/b_new_build
Update more files for new build processs
2 parents ca14bf8 + 4f8dbbb commit a65f184

13 files changed

+177
-97
lines changed

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
15
*.mpy
26
.idea
37
__pycache__
48
_build
59
*.pyc
610
.env
7-
build*
11+
.python-version
12+
build*/
813
bundles
914
*.DS_Store
1015
.eggs
1116
dist
12-
**/*.egg-info
17+
**/*.egg-info
18+
.vscode

.pylintrc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
15
[MASTER]
26

37
# A comma-separated list of package or module names from where C extensions may
48
# be loaded. Extensions are loading into the active Python interpreter and may
59
# run arbitrary code
610
extension-pkg-whitelist=
711

8-
# Add files or directories to the blacklist. They should be base names, not
12+
# Add files or directories to the ignore-list. They should be base names, not
913
# paths.
1014
ignore=CVS
1115

12-
# Add files or directories matching the regex patterns to the blacklist. The
16+
# Add files or directories matching the regex patterns to the ignore-list. The
1317
# regex matches against base names, not paths.
1418
ignore-patterns=
1519

@@ -18,8 +22,7 @@ ignore-patterns=
1822
#init-hook=
1923

2024
# Use multiple processes to speed up Pylint.
21-
# jobs=1
22-
jobs=2
25+
jobs=1
2326

2427
# List of plugins (as comma separated values of python modules names) to load,
2528
# usually to register additional checkers.
@@ -52,7 +55,7 @@ confidence=
5255
# no Warning level messages displayed, use"--disable=all --enable=classes
5356
# --disable=W"
5457
# disable=import-error,print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
55-
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error
58+
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,import-error,bad-continuation,pointless-string-statement
5659

5760
# Enable the message, report, category or checker with the given id(s). You can
5861
# either give multiple identifier separated by comma (,) or put this option
@@ -246,10 +249,10 @@ ignore-comments=yes
246249
ignore-docstrings=yes
247250

248251
# Ignore imports when computing similarities.
249-
ignore-imports=no
252+
ignore-imports=yes
250253

251254
# Minimum lines number of a similarity.
252-
min-similarity-lines=4
255+
min-similarity-lines=12
253256

254257

255258
[BASIC]

README.rst

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ Introduction
55
:target: https://sparkfun-circuitpython-qwiictwist.readthedocs.io/en/latest/
66
:alt: Documentation Status
77

8+
89
.. image:: https://img.shields.io/discord/327254708534116352.svg
910
:target: https://adafru.it/discord
1011
:alt: Discord
1112

12-
.. image:: https://travis-ci.org/fourstix/Sparkfun_CircuitPython_QwiicTwist.svg?branch=master
13-
:target: https://travis-ci.org/fourstix/Sparkfun_CircuitPython_QwiicTwist
13+
14+
.. image:: https://github.com/fourstix/Sparkfun_CircuitPython_QwiicTwist/workflows/Build%20CI/badge.svg
15+
:target: https://github.com/fourstix/Sparkfun_CircuitPython_QwiicTwist/actions
1416
:alt: Build Status
1517

18+
19+
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
20+
:target: https://github.com/psf/black
21+
:alt: Code Style: Black
22+
1623
CircuitPython library for Sparkfun Qwiic Twist RGB Rotary Encoder. This library is ported from
1724
`SparkFun Qwiic Twist Arduino Library <https://github.com/sparkfun/SparkFun_Qwiic_Twist_Arduino_Library>`_
1825

@@ -22,8 +29,6 @@ CircuitPython library for Sparkfun Qwiic Twist RGB Rotary Encoder. This library
2229

2330
`SparkFun Qwiic Twist RGB Rotary Encoder (DEV-15083) <https://www.sparkfun.com/products/15083>`_
2431

25-
26-
2732
Dependencies
2833
=============
2934
This driver depends on:
@@ -34,7 +39,9 @@ This driver depends on:
3439

3540
Please ensure all dependencies are available on the CircuitPython filesystem.
3641
This is easily achieved by downloading
37-
`the Adafruit library and driver bundle <https://github.com/adafruit/Adafruit_CircuitPython_Bundle>`_.
42+
`the Adafruit library and driver bundle <https://circuitpython.org/libraries>`_
43+
or individual libraries can be installed using
44+
`circup <https://github.com/adafruit/circup>`_.
3845

3946
Raspberry Pi Setup
4047
------------------
@@ -78,23 +85,21 @@ Quick Start Summary:
7885
pip3 install adafruit-blinka
7986
8087
Installing from PyPI
81-
--------------------
82-
On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
83-
PyPI <https://pypi.org/project/sparkfun-circuitpython-qwiictwist/>`_.
84-
85-
Installing this library will also install the dependency adafruit-circuitpython-busdevice.
88+
=====================
8689

87-
Installing from PyPI
90+
On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
91+
PyPI <https://pypi.org/project/Sparkfun-circuitpython-qwiictwist/>`_.
92+
To install for current user:
8893

8994
.. code-block:: shell
9095
91-
pip install git+https://github.com/FAR-Lab/Sparkfun_CircuitPython_QwiicTwist.git
96+
pip3 install Sparkfun-circuitpython-qwiictwist
9297
9398
To install system-wide (this may be required in some cases):
9499

95100
.. code-block:: shell
96101
97-
sudo pip3 install sparkfun-circuitpython-qwiictwist
102+
sudo pip3 install Sparkfun-circuitpython-qwiictwist
98103
99104
To install in a virtual environment in your current project:
100105

@@ -103,7 +108,32 @@ To install in a virtual environment in your current project:
103108
mkdir project-name && cd project-name
104109
python3 -m venv .env
105110
source .env/bin/activate
106-
pip3 install sparkfun-circuitpython-qwiictwist
111+
pip3 install Sparkfun-circuitpython-qwiictwist
112+
113+
114+
115+
Installing to a Connected CircuitPython Device with Circup
116+
==========================================================
117+
118+
Make sure that you have ``circup`` installed in your Python environment.
119+
Install it with the following command if necessary:
120+
121+
.. code-block:: shell
122+
123+
pip3 install circup
124+
125+
With ``circup`` installed and your CircuitPython device connected use the
126+
following command to install:
127+
128+
.. code-block:: shell
129+
130+
circup install qwiictwist
131+
132+
Or the following command to update an existing version:
133+
134+
.. code-block:: shell
135+
136+
circup update
107137
108138
Usage Example
109139
=============
@@ -125,14 +155,19 @@ Usage Example
125155
# For a different address use QwiicTwist(i2c, address)
126156
# twist = QwiicTwist(i2c, 0x3E)
127157
128-
129158
Contributing
130159
============
131160

132161
Contributions are welcome! Please read our `Code of Conduct
133-
<https://github.com/fourstix/Sparkfun_CircuitPython_QwiicTwist/blob/master/CODE_OF_CONDUCT.md>`_
162+
<https://github.com/fourstix/Sparkfun_CircuitPython_QwiicTwist/blob/HEAD/CODE_OF_CONDUCT.md>`_
134163
before contributing to help this project stay welcoming.
135164

165+
Documentation
166+
=============
167+
168+
For information on building library documentation, please check out
169+
`this guide <https://learn.adafruit.com/creating-and-sharing-a-circuitpython-library/sharing-our-docs-on-readthedocs#sphinx-5-1>`_.
170+
136171
Building locally
137172
================
138173

@@ -160,29 +195,6 @@ Then run the build:
160195
161196
circuitpython-build-bundles --filename_prefix sparkfun-circuitpython-qwiictwist --library_location .
162197
163-
Sphinx documentation
164-
-----------------------
165-
166-
Sphinx is used to build the documentation based on rST files and comments in the code. First,
167-
install dependencies (feel free to reuse the virtual environment from above):
168-
169-
.. code-block:: shell
170-
171-
python3 -m venv .env
172-
source .env/bin/activate
173-
pip install Sphinx sphinx-rtd-theme
174-
175-
Now, once you have the virtual environment activated:
176-
177-
.. code-block:: shell
178-
179-
cd docs
180-
sphinx-build -E -W -b html . _build/html
181-
182-
This will output the documentation to ``docs/_build/html``. Open the index.html in your browser to
183-
view them. It will also (due to -W) error out on any warning like Travis will. This is a good way to
184-
locally verify it will pass.
185-
186198
License Information
187199
-----------------------
188200
This product is **open source**!

docs/_static/favicon.ico.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2018 Phillip Torrone for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
.. use this format as the module name: "adafruit_foo.foo"
66
77
.. automodule:: sparkfun_qwiictwist
8-
:members:
8+
:members:

docs/api.rst.license

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
SPDX-FileCopyrightText: Copyright (c) 2021 Gaston Williams
3+
4+
SPDX-License-Identifier: MIT

0 commit comments

Comments
 (0)