Skip to content

Commit 2cd946e

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents d7ec9c5 + 52f3a96 commit 2cd946e

File tree

4 files changed

+97
-7
lines changed

4 files changed

+97
-7
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ python:
55
- "3.4"
66
- "3.5"
77
- "3.6"
8-
- "3.7-dev" # 3.7 development branch
8+
- "3.7-dev"
99
- "nightly" # currently points to 3.7-dev
1010
# command to install dependencies
11-
install: "pip install -U setuptools setuptools_scm"
11+
install: "pip install -U setuptools setuptools_scm codecov"
1212
# command to run tests
13-
script: python setup.py test
13+
script:
14+
- python setup.py test
15+
1416
after_success:
15-
coveralls
17+
- codecov

CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at steein.shamsudin@gmail.com. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# TRON API for Python
22
A Python API for interacting with the Tron (TRX)
33

4-
[![Software License](https://img.shields.io/badge/license-Apache-brightgreen.svg?style=flat-square)](LICENSE)
4+
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
55
[![Requirements Status](https://requires.io/github/iexbase/tron-api-python/requirements.svg?branch=master)](https://requires.io/github/iexbase/tron-api-python/requirements/?branch=master)
6-
[![Coverage Status](https://coveralls.io/repos/github/iexbase/tron-api-python/badge.svg?branch=master)](https://coveralls.io/github/iexbase/tron-api-python?branch=master)
76
[![Build Status](https://api.travis-ci.com/iexbase/tron-api-python.svg?branch=master)](https://travis-ci.com/iexbase/tron-api-python)
87
[![Issues](https://img.shields.io/github/issues/iexbase/tron-api-python.svg)](https://github.com/iexbase/tron-api-python/issues)
98
[![Pull Requests](https://img.shields.io/github/issues-pr/iexbase/tron-api-python.svg)](https://github.com/iexbase/tron-api-python/pulls)
@@ -15,7 +14,6 @@ A Python API for interacting with the Tron (TRX)
1514
| :------ | :------------------ | :---------
1615
| install | `pip install tronapi` |
1716

18-
1917
## Basic Usage
2018
Specify the API endpoints:
2119

codecov.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
coverage:
2+
round: down
3+
precision: 5
4+
5+
# Repository Yaml
6+
coverage:
7+
round: up
8+
range: 0..10
9+
10+
# Used in Codecov after updating
11+
coverage:
12+
round: up
13+
range: 0..10
14+
precision: 5

0 commit comments

Comments
 (0)