From 0bd2b4e8d9aecd0b0cb70d4bce597d2bbd7f92e3 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@pinterest.com>
Date: Wed, 31 Oct 2018 15:49:25 -0700
Subject: [PATCH] Prepare the 1.4.1 release

- Update the changelog
- Include our Code of Conduct and Adopters documents
---
 ADOPTERS.md          |  7 +++++++
 CHANGELOG.rst        |  1 +
 CODE_OF_CONDUCT.md   | 40 ++++++++++++++++++++++++++++++++++++++++
 snappass/__init__.py |  3 +--
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 ADOPTERS.md
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/ADOPTERS.md b/ADOPTERS.md
new file mode 100644
index 00000000..657767d5
--- /dev/null
+++ b/ADOPTERS.md
@@ -0,0 +1,7 @@
+# Adopters
+
+This is an alphabetical list of people and organizations who are using this
+project. If you'd like to be included here, please send a Pull Request that
+adds your information to this file.
+
+- [Pinterest](https://www.pinterest.com/)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 60e79ae2..291b8dd6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,6 @@
 Version 1.4.1
 -------------
+ * Switch to local (non-CDN) Font Awesome assets
  * Upgraded cryptography to 2.3.1 (for CVE-2018-10903, although snappass is
    unaffected because it doesn't use the vulnerable ``finalize_with_tag`` API)
 
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..3f8554e9
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,40 @@
+# Code of Conduct
+
+At Pinterest, we work hard to ensure that our work environment is welcoming
+and inclusive to as many people as possible. We are committed to creating this
+environment for everyone involved in our open source projects as well. We
+welcome all participants regardless of ability, age, ethnicity, identified
+gender, religion (or lack there of), sexual orientation and socioeconomic
+status.
+
+This code of conduct details our expectations for upholding these values.
+
+## Good behavior
+
+We expect members of our community to exhibit good behavior including (but of
+course not limited to):
+
+- Using intentional and empathetic language.
+- Focusing on resolving instead of escalating conflict.
+- Providing constructive feedback.
+
+## Unacceptable behavior
+
+Some examples of unacceptable behavior (again, this is not an exhaustive
+list):
+
+- Harassment, publicly or in private.
+- Trolling.
+- Sexual advances (this isn’t the place for it).
+- Publishing other’s personal information.
+- Any behavior which would be deemed unacceptable in a professional environment.
+
+## Recourse
+
+If you are witness to or the target of unacceptable behavior, it should be
+reported to Pinterest at opensource-policy@pinterest.com. All reporters will
+be kept confidential and an appropriate response for each incident will be
+evaluated.
+
+If the snappass maintainers do not uphold and enforce this code of conduct in
+good faith, community leadership will hold them accountable.
diff --git a/snappass/__init__.py b/snappass/__init__.py
index b5db515a..8e3c933c 100644
--- a/snappass/__init__.py
+++ b/snappass/__init__.py
@@ -1,2 +1 @@
-__author__ = 'davedash'
-__version__ = '1.4.0'
+__version__ = '1.4.1'