Skip to content

Commit 8215f00

Browse files
committed
Merge branch 'master' into development
2 parents bd6be2c + 8c438b7 commit 8215f00

File tree

4 files changed

+68
-1
lines changed

4 files changed

+68
-1
lines changed

CODE_OF_CONDUCT.md

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

CONTRIBUTING.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Contribution
2+
------------
3+
4+
[ciscosparkapi](https://github.com/CiscoDevNet/ciscosparkapi) is a community
5+
development project. Feedback, thoughts, ideas and code contributions are
6+
most welcome!
7+
8+
**How to contributed feedback, issues, thoughts and ideas...**
9+
10+
Please use the [issues](https://github.com/CiscoDevNet/ciscosparkapi/issues)
11+
log. to report issues or post ideas for enhancement or discussion.
12+
13+
**Interested in contributing code?**
14+
15+
1. Check for open [issues] or create a new 'issue' for the item you want to work on, and make sure to comment and let us know that you are working on it.
16+
2. Fork a copy of the repository.
17+
3. Add your code to your forked repository.
18+
4. We follow PEP8 fairly strictly for this project. Please make sure your code passes the lint tests (we use `flake8` for linting). Just run `make lint`.
19+
5. Submit a **pull request**. If everything looks good, we will gladly merge your request.

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ lint :
4747
# Git recipes
4848
.PHONY : push
4949
push :
50+
git push origin
5051
git push origin --tags
5152

5253

@@ -74,7 +75,7 @@ cleanpytest :
7475
clean-all : clean clean-dist ;
7576

7677
.PHONY : clean-dist
77-
cleandist :
78+
clean-dist :
7879
rm -rf ./dist/*
7980

8081
.PHONY : clean-venv

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ pytest
66
tox
77
virtualenv
88
flake8
9+
twine

0 commit comments

Comments
 (0)