Skip to content

Commit 8fe577e

Browse files
committed
Merge branch 'master' into pylint-update
2 parents f0b7040 + 5fe41b1 commit 8fe577e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,13 @@ jobs:
3434
with:
3535
repository: adafruit/actions-ci-circuitpython-libs
3636
path: actions-ci
37-
- name: Install deps
37+
- name: Install dependencies
38+
# (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
3839
run: |
3940
source actions-ci/install.sh
41+
- name: Pip install pylint, black, & Sphinx
42+
run: |
43+
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
4044
- name: Library version
4145
run: git describe --dirty --always --tags
4246
- name: PyLint

CODE_OF_CONDUCT.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Examples of unacceptable behavior by participants include:
3434
* Excessive or unwelcome helping; answering outside the scope of the question
3535
asked
3636
* Trolling, insulting/derogatory comments, and personal or political attacks
37+
* Promoting or spreading disinformation, lies, or conspiracy theories against
38+
a person, group, organisation, project, or community
3739
* Public or private harassment
3840
* Publishing others' private information, such as a physical or electronic
3941
address, without explicit permission
@@ -72,10 +74,10 @@ You may report in the following ways:
7274
In any situation, you may send an email to <[email protected]>.
7375

7476
On the Adafruit Discord, you may send an open message from any channel
75-
to all Community Helpers by tagging @community helpers. You may also send an
76-
open message from any channel, or a direct message to @kattni#1507,
77-
@tannewt#4653, @Dan Halbert#1614, @cater#2442, @sommersoft#0222, or
78-
@Andon#8175.
77+
to all Community Moderators by tagging @community moderators. You may
78+
also send an open message from any channel, or a direct message to
79+
@kattni#1507, @tannewt#4653, @Dan Halbert#1614, @cater#2442,
80+
@sommersoft#0222, @Mr. Certainly#0472 or @Andon#8175.
7981

8082
Email and direct message reports will be kept confidential.
8183

0 commit comments

Comments
 (0)