Skip to content

Commit ab1dfc8

Browse files
authored
Merge branch 'master' into update-for-ethernet
2 parents 9cf7b51 + 6b3c2aa commit ab1dfc8

10 files changed

+269
-207
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
source actions-ci/install.sh
4141
- name: Pip install pylint, black, & Sphinx
4242
run: |
43-
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
43+
pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

CODE_OF_CONDUCT.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ 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
4042
* Other conduct which could reasonably be considered inappropriate
4143

4244
The goal of the standards and moderation guidelines outlined here is to build
4345
and maintain a respectful community. We ask that you don’t just aim to be
44-
"technically unimpeachable", but rather try to be your best self.
46+
"technically unimpeachable", but rather try to be your best self.
4547

4648
We value many things beyond technical expertise, including collaboration and
4749
supporting others within our community. Providing a positive experience for
@@ -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 moderators. 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)