Skip to content

Commit cfa5023

Browse files
Twilio update
1 parent 1e05fa7 commit cfa5023

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+338
-316
lines changed

.github/PULL_REQUEST_TEMPLATE

+1
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](https://github.com/sendgrid/sendgrid-python/blob/v4/CONTRIBUTING.md), and 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.

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ temp.py
2424
live_test.py
2525
__pycache__
2626
example.pdf
27+
TODO.txt
28+
twilio.env

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## [6.0.3] - 2019-04-05 ##
5+
6+
### Added
7+
- Twilio SendGrid branding
8+
- [Twilio SMS example](https://github.com/sendgrid/sendgrid-python/blob/master/use_cases/sms.md)
9+
- Updated CLA process
10+
411
## [6.0.0] - 2019-04-02 ##
512

613
### BREAKING CHANGE

CODE_OF_CONDUCT.md

+10-10
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

+4-14
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 libraries. 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 libraries. 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)
@@ -27,17 +28,6 @@ Hello! Thank you for choosing to help contribute to one of the SendGrid open sou
2728
<a name="roadmap"></a>
2829
We use [Milestones](https://github.com/sendgrid/sendgrid-python/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 reviews, comments, suggestions, and additional PRs are welcomed and encouraged.
2930

30-
<a name="cla"></a>
31-
## CLAs and CCLAs
32-
33-
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.
34-
35-
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.
36-
37-
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).
38-
39-
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.
40-
4131
There are a few ways to contribute, which we'll enumerate below:
4232

4333
<a name="feature-request"></a>
@@ -95,7 +85,7 @@ cd sendgrid-python
9585

9686
### Environment Variables
9787

98-
First, get your free SendGrid account [here](https://sendgrid.com/free?source=sendgrid-python).
88+
First, get your free Twilio SendGrid account [here](https://sendgrid.com/free?source=sendgrid-python).
9989

10090
Next, update your environment with your [SENDGRID_API_KEY](https://app.sendgrid.com/settings/api_keys).
10191

FIRST_TIMERS.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
## Welcome to the SendGrid Open Source Community
1+
## Welcome to the Twilio SendGrid Open Source Community
22
If you are new to Open Source, you are at the right place to start with. Contributions are always encouraged & appreciated. Just follow the organisation's Contribution Policies & you are good to go.
33
## How to get Started?
4-
- [Explore SendGrid](#explore)
4+
- [Explore Twilio SendGrid](#explore)
55
- [Raise Issues(If Found Any)](#issues)
66
- [Setting up the Development Environment](#setup)
77
- [Proposing Change through a Pull Request](#pr)
88
- [Be Patient & Wait for reviews](#reviews)
99

1010
<a name="explore"></a>
11-
### Explore SendGrid
12-
Step 1: Get yourself Access to SendGrid API Service absolutely free from [here](https://sendgrid.com/free/?source=sendgrid-python)\
13-
Step 2: Get familiar with SendGrid Service
11+
### Explore Twilio SendGrid
12+
Step 1: Get yourself Access to Twilio SendGrid API Service absolutely free from [here](https://sendgrid.com/free/?source=sendgrid-python)\
13+
Step 2: Get familiar with Twilio SendGrid Service
1414
- Prerequisites are Python version 2.6, 2.7, 3.4, 3.5 or 3.6
15-
- Set up your [SendGrid API Key](https://app.sendgrid.com/settings/api_keys) to your local workspace [using](https://github.com/sendgrid/sendgrid-python#setup-environment-variables)
16-
- Install SendGrid to your workspace using `pip install sendgrid`
15+
- Set up your [Twilio SendGrid API Key](https://app.sendgrid.com/settings/api_keys) to your local workspace [using](https://github.com/sendgrid/sendgrid-python#setup-environment-variables)
16+
- Install Twilio SendGrid to your workspace using `pip install sendgrid`
1717
- Copy & Run few sample programs from [here](https://github.com/sendgrid/sendgrid-python#hello-email)
1818

1919

2020
<a name="issues"></a>
2121
### Raise Issues
22-
SendGrid uses GitHub as the content management service so, all the issues related to the project be it some feature request or a bug report, all are reported at the [GitHub Issue Tracker](https://github.com/sendgrid/sendgrid-python/issues)\
22+
Twilio SendGrid uses GitHub as the content management service so, all the issues related to the project be it some feature request or a bug report, all are reported at the [GitHub Issue Tracker](https://github.com/sendgrid/sendgrid-python/issues)\
2323
Kindly make sure, to check for any duplicate issues raised by fellow contributors before opening a new issue. Be humble & polite while commenting on issues
2424
- Feature Request\
2525
In case you feel like something is missing or lacking in the API Service, feel free to share your views & opinions with the community
@@ -38,7 +38,7 @@ Step 2: Get familiar with SendGrid Service
3838
- **Setting up Locally**\
3939
Step 1: Install the Prerequistes: Any Version of Python(2.6 through 3.6) & [python_http_client](https://github.com/sendgrid/python-http-client)\
4040
Step 2: Get a local copy of repository using `git clone https://github.com/sendgrid/sendgrid-python.git`\
41-
Step 3: Set your [SendGrid API Key](https://app.sendgrid.com/settings/api_keys) to your local workspace using\
41+
Step 3: Set your [Twilio SendGrid API Key](https://app.sendgrid.com/settings/api_keys) to your local workspace using\
4242
`echo "export SENDGRID_API_KEY='YOUR_API_KEY'" > sendgrid.env`\
4343
`echo "sendgrid.env" >> .gitignore`\
4444
`source ./sendgrid.env`\

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2019 SendGrid, Inc.
1+
Copyright (c) 2012-2019 Twilio SendGrid, Inc.
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
44
documentation files (the "Software"), to deal in the Software without restriction, including without limitation

0 commit comments

Comments
 (0)