Skip to content

Commit 3103dc9

Browse files
Twilio branding and CLA policy update (#124)
1 parent 397b3a6 commit 3103dc9

File tree

8 files changed

+28
-36
lines changed

8 files changed

+28
-36
lines changed

.github/PULL_REQUEST_TEMPLATE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--
22
We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines given above, then fill out the blanks below.
33

4+
**All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.**
45

56
Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
67
e.g.
@@ -10,6 +11,7 @@ Closes #2
1011
# Fixes #
1112

1213
### Checklist
14+
- [ ] I acknowledge that all my contributions will be made under the project's license
1315
- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
1416
- [ ] I have read the [Contribution Guide] and my PR follows them.
1517
- [ ] I updated my branch with the development branch.
@@ -21,4 +23,4 @@ Closes #2
2123
-
2224
-
2325

24-
If you have questions, please send an email to [SendGrid](mailto:[email protected]), or file a GitHub Issue in this repository.
26+
If you have questions, please send an email to the [Twilio SendGrid Developer Experience Team](mailto:[email protected]), or file a GitHub Issue in this repository.

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
# SendGrid Community Code of Conduct
1+
# Twilio SendGrid Community Code of Conduct
22

3-
The SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community.
3+
The Twilio SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community.
44

55
### Be Open
66
Members of the community are open to collaboration, whether it's on pull requests, code reviews, approvals, issues or otherwise. We're receptive to constructive comments and criticism, as the experiences and skill sets of all members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate, and everyone can make a difference.
77

88
### Be Considerate
9-
Members of the community are considerate of their peers, which include other contributors and users of SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
9+
Members of the community are considerate of their peers, which include other contributors and users of Twilio SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
1010

1111
### Be Respectful
12-
Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues. Overall, we're good with each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
12+
Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Twilio SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues. Overall, we're good with each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
1313

1414
## Additional Guidance
1515

1616
### Disclose Potential Conflicts of Interest
1717
Community discussions often involve interested parties. We expect participants to be aware when they are conflicted due to employment or other projects they are involved in and disclose those interests to other project members. When in doubt, over-disclose. Perceived conflicts of interest are important to address so that the community’s decisions are credible even when unpopular, difficult or favorable to the interests of one group over another.
1818

1919
### Interpretation
20-
This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter. When in doubt, try to abide by [SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.
20+
This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter. When in doubt, try to abide by [Twilio SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.
2121

2222
### Enforcement
23-
Most members of the SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
23+
Most members of the Twilio SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
2424

2525
## If you have concerns about someone’s conduct
2626
**Initiate Direct Contact** - It is always appropriate to email a community member (if contact information is available), mention that you think their behavior was out of line, and (if necessary) point them to this Code.
2727

2828
**Discuss Publicly** - Discussing publicly is always acceptable. Note, though, that approaching the person directly may be better, as it tends to make them less defensive, and it respects the time of other community members, so you probably want to try direct contact first.
2929

30-
**Contact the Moderators** - You can reach the SendGrid moderators by emailing [email protected].
30+
**Contact the Moderators** - You can reach the Twilio SendGrid moderators by emailing [email protected].
3131

32-
## Submission to SendGrid Repositories
33-
Finally, just a reminder, changes to the SendGrid repositories will only be accepted upon completion of the [SendGrid Contributor Agreement](https://cla.sendgrid.com).
32+
## Submission to Twilio SendGrid Repositories
33+
Finally, just a reminder, changes to the Twilio SendGrid repositories will only be accepted upon completion of the [Twilio SendGrid Contributor Agreement](https://cla.sendgrid.com).
3434

3535
## Attribution
3636

37-
SendGrid thanks the following, on which it draws for content and inspiration:
37+
Twilio SendGrid thanks the following, on which it draws for content and inspiration:
3838

3939
* [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/)
4040
* [Open Source Initiative General Code of Conduct](https://opensource.org/codeofconduct)

CONTRIBUTING.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Hello! Thank you for choosing to help contribute to one of the SendGrid open source projects. There are many ways you can contribute and help is always welcome. We simply ask that you follow the following contribution policies.
1+
Hello! Thank you for choosing to help contribute to one of the Twilio SendGrid open source projects. There are many ways you can contribute and help is always welcome. We simply ask that you follow the following contribution policies.
2+
3+
**All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.**
24

3-
- [CLAs and CCLAs](#clas-and-cclas)
45
- [Feature Request](#feature-request)
56
- [Submit a Bug Report](#submit-a-bug-report)
67
- [Please use our Bug Report Template](#please-use-our-bug-report-template)
@@ -23,17 +24,6 @@ Hello! Thank you for choosing to help contribute to one of the SendGrid open sou
2324
<a name="roadmap"></a>
2425
We use [Milestones](https://github.com/sendgrid/python-http-client/milestones) to help define current roadmaps, please feel free to grab an issue from the current milestone. Please indicate that you have begun work on it to avoid collisions. Once a PR is made, community review, comments, suggestions, and additional PRs are welcomed and encouraged.
2526

26-
<a name="cla"></a>
27-
## CLAs and CCLAs
28-
29-
Before you get started, SendGrid requires that a SendGrid Contributor License Agreement (CLA) be filled out by every contributor to a SendGrid open source project.
30-
31-
Our goal with the CLA is to clarify the rights of our contributors and reduce other risks arising from inappropriate contributions. The CLA also clarifies the rights SendGrid holds in each contribution and helps to avoid misunderstandings over what rights each contributor is required to grant to SendGrid when making a contribution. In this way, the CLA encourages broad participation by our open source community and helps us build strong open source projects, free from any individual contributor withholding or revoking rights to any contribution.
32-
33-
SendGrid does not merge a pull request made against a SendGrid open source project until that pull request is associated with a signed CLA. Copies of the CLA are available [here](https://gist.github.com/SendGridDX/98b42c0a5d500058357b80278fde3be8#file-sendgrid_cla).
34-
35-
When you create a Pull Request, after a few seconds, a comment will appear with a link to the CLA. Click the link and fill out the brief form and then click the "I agree" button and you are all set. You will not be asked to re-sign the CLA unless we make a change.
36-
3727
There are a few ways to contribute, which we'll enumerate below:
3828

3929
<a name="feature-request"></a>

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN python2.7 get-pip.py && \
2828
pip install tox && \
2929
rm get-pip.py
3030

31-
# set up default sendgrid env
31+
# set up default Twilio SendGrid env
3232
WORKDIR /root/sources
3333
RUN git clone https://github.com/sendgrid/sendgrid-python.git && \
3434
git clone https://github.com/sendgrid/python-http-client.git

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2012 - 2019 SendGrid, Inc.
3+
Copyright (c) 2012 - 2019 Twilio SendGrid, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
.. image:: https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png
1+
.. image:: https://github.com/sendgrid/sendgrid-python/raw/master/twilio_sendgrid_logo.png
22
:target: https://www.sendgrid.com
33

44
|Build Status| |Email Notifications Badge| |Twitter Follow| |Codecov branch| |Code Climate| |Python Versions| |PyPI Version| |GitHub contributors| |MIT licensed|
55

66
**Quickly and easily access any RESTful or RESTful-like API.**
77

8-
If you are looking for the SendGrid API client library, please see `this repo`_.
8+
If you are looking for the Twilio SendGrid API client library, please see `this repo`_.
99

1010
Table of Contents
1111
=================
@@ -47,7 +47,7 @@ or
4747
API Key
4848
-------
4949

50-
Store your SendGrid API key in a ``.env`` file.
50+
Store your Twilio SendGrid API key in a ``.env`` file.
5151

5252
.. code:: bash
5353
@@ -142,10 +142,10 @@ We were inspired by the work done on `birdy`_ and `universalclient`_.
142142
About
143143
=====
144144

145-
**python-http-client** is guided and supported by the SendGrid `Developer Experience Team`_.
145+
**python-http-client** is guided and supported by the Twilio SendGrid `Developer Experience Team`_.
146146

147-
**python-http-client** is maintained and funded by SendGrid, Inc.
148-
The names and logos for **python-http-client** are trademarks of SendGrid, Inc.
147+
**python-http-client** is maintained and funded by Twilio SendGrid, Inc.
148+
The names and logos for **python-http-client** are trademarks of Twilio SendGrid, Inc.
149149

150150
License
151151
=======

first-timers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# How To Contribute to SendGrid Repositories via GitHub
1+
# How To Contribute to Twilio SendGrid Repositories via GitHub
22

3-
Contributing to the SendGrid is easy! All you need to do is find an open issue (see the bottom of this page for a list of repositories containing open issues), fix it and submit a pull request. Once you have submitted your pull request, the team can easily review it before it is merged into the repository.
3+
Contributing to the Twilio SendGrid is easy! All you need to do is find an open issue (see the bottom of this page for a list of repositories containing open issues), fix it and submit a pull request. Once you have submitted your pull request, the team can easily review it before it is merged into the repository.
44
To make a pull request, follow these steps:
55

6-
1. Log into GitHub. If you do not already have a GitHub account, you will have to create one in order to submit a change. Click the Sign up link in the upper right-hand corner to create an account. Enter your username, password, and email address. If you are an employee of SendGrid, please use your full name with your GitHub account and enter SendGrid as your company so we can easily identify you.
6+
1. Log into GitHub. If you do not already have a GitHub account, you will have to create one in order to submit a change. Click the Sign up link in the upper right-hand corner to create an account. Enter your username, password, and email address. If you are an employee of Twilio SendGrid, please use your full name with your GitHub account and enter Twilio SendGrid as your company so we can easily identify you.
77
<img src="/static/img/github-signup.png" width="800">
88
2. **[Fork](https://help.github.com/fork-a-repo/)** the [python-http-client](https://github.com/sendgrid/python-http-client) repository:
99

tests/test_daterange.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def setUp(self):
99
self.openlicensefile = os.path.join(
1010
os.path.dirname(__file__),
1111
'../LICENSE.txt')
12-
self.pattern = 'Copyright (c) 2012 - %s SendGrid, Inc.' % (
12+
self.pattern = 'Copyright (c) 2012 - %s Twilio SendGrid, Inc.' % (
1313
time.strftime("%Y"))
1414
fh = open(self.openlicensefile)
1515
self.licensefile = fh.read()

0 commit comments

Comments
 (0)