Skip to content

Commit 7b3173f

Browse files
committed
version to 1.0. update coc, license, readme
1 parent 9d27534 commit 7b3173f

File tree

6 files changed

+149
-79
lines changed

6 files changed

+149
-79
lines changed

CODE_OF_CONDUCT.md

Lines changed: 116 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,130 @@
1-
# Contributor Code of Conduct
21

3-
As contributors and maintainers of this project, and in the interest of
4-
fostering an open and welcoming community, we pledge to respect all people who
5-
contribute through reporting issues, posting feature requests, updating
6-
documentation, submitting pull requests or patches, and other activities.
2+
# Contributor Covenant Code of Conduct
73

8-
We are committed to making participation in this project a harassment-free
9-
experience for everyone, regardless of level of experience, gender, gender
10-
identity and expression, sexual orientation, disability, personal appearance,
11-
body size, race, ethnicity, age, religion, or nationality.
4+
## Our Pledge
125

13-
Examples of unacceptable behavior by participants include:
6+
We as members, contributors, and leaders pledge to make participation in our
7+
community a harassment-free experience for everyone, regardless of age, body
8+
size, visible or invisible disability, ethnicity, sex characteristics, gender
9+
identity and expression, level of experience, education, socio-economic status,
10+
nationality, personal appearance, race, religion, or sexual identity
11+
and orientation.
1412

15-
* The use of sexualized language or imagery
16-
* Personal attacks
17-
* Trolling or insulting/derogatory comments
13+
We pledge to act and interact in ways that contribute to an open, welcoming,
14+
diverse, inclusive, and healthy community.
15+
16+
## Our Standards
17+
18+
Examples of behavior that contributes to a positive environment for our
19+
community include:
20+
21+
* Demonstrating empathy and kindness toward other people
22+
* Being respectful of differing opinions, viewpoints, and experiences
23+
* Giving and gracefully accepting constructive feedback
24+
* Accepting responsibility and apologizing to those affected by our mistakes,
25+
and learning from the experience
26+
* Focusing on what is best not just for us as individuals, but for the
27+
overall community
28+
29+
Examples of unacceptable behavior include:
30+
31+
* The use of sexualized language or imagery, and sexual attention or
32+
advances of any kind
33+
* Trolling, insulting or derogatory comments, and personal or political attacks
1834
* Public or private harassment
19-
* Publishing other's private information, such as physical or electronic
20-
addresses, without explicit permission
21-
* Other unethical or unprofessional conduct
35+
* Publishing others' private information, such as a physical or email
36+
address, without their explicit permission
37+
* Other conduct which could reasonably be considered inappropriate in a
38+
professional setting
39+
40+
## Enforcement Responsibilities
41+
42+
Community leaders are responsible for clarifying and enforcing our standards of
43+
acceptable behavior and will take appropriate and fair corrective action in
44+
response to any behavior that they deem inappropriate, threatening, offensive,
45+
or harmful.
2246

23-
Project maintainers have the right and responsibility to remove, edit, or
24-
reject comments, commits, code, wiki edits, issues, and other contributions
25-
that are not aligned to this Code of Conduct, or to ban temporarily or
26-
permanently any contributor for other behaviors that they deem inappropriate,
27-
threatening, offensive, or harmful.
47+
Community leaders have the right and responsibility to remove, edit, or reject
48+
comments, commits, code, wiki edits, issues, and other contributions that are
49+
not aligned to this Code of Conduct, and will communicate reasons for moderation
50+
decisions when appropriate.
2851

29-
By adopting this Code of Conduct, project maintainers commit themselves to
30-
fairly and consistently applying these principles to every aspect of managing
31-
this project. Project maintainers who do not follow or enforce the Code of
32-
Conduct may be permanently removed from the project team.
52+
## Scope
3353

34-
This Code of Conduct applies both within project spaces and in public spaces
35-
when an individual is representing the project or its community.
54+
This Code of Conduct applies within all community spaces, and also applies when
55+
an individual is officially representing the community in public spaces.
56+
Examples of representing our community include using an official e-mail address,
57+
posting via an official social media account, or acting as an appointed
58+
representative at an online or offline event.
59+
60+
## Enforcement
3661

3762
Instances of abusive, harassing, or otherwise unacceptable behavior may be
38-
reported by contacting a project maintainer at [[email protected]]. All
39-
complaints will be reviewed and investigated and will result in a response that
40-
is deemed necessary and appropriate to the circumstances. Maintainers are
41-
obligated to maintain confidentiality with regard to the reporter of an
42-
incident.
63+
reported to the community leaders responsible for enforcement at
64+
[INSERT CONTACT METHOD].
65+
All complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
74+
75+
### 1. Correction
76+
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
4379

80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
83+
84+
### 2. Warning
85+
86+
**Community Impact**: A violation through a single incident or series
87+
of actions.
88+
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or
94+
permanent ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
100+
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within
114+
the community.
115+
116+
## Attribution
44117

45118
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
46-
version 1.3.0, available at
47-
[http://contributor-covenant.org/version/1/3/0/][version]
119+
version 2.0, available at
120+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
121+
122+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
123+
enforcement ladder](https://github.com/mozilla/diversity).
124+
125+
[homepage]: https://www.contributor-covenant.org
126+
127+
For answers to common questions about this code of conduct, see the FAQ at
128+
https://www.contributor-covenant.org/faq. Translations are available at
129+
https://www.contributor-covenant.org/translations.
48130

49-
[homepage]: http://contributor-covenant.org
50-
[version]: http://contributor-covenant.org/version/1/3/0/

HISTORY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# next
22

3+
- Your PR goes here :)
4+
5+
# 1.0.0
6+
37
- Issue #26 fix where hardcoded "/tmp" reference was being used
48
- Support up to Python 3.8
59
- Drop support for Python 2, 3.4
610

711
Dev-only:
812

13+
- Bump Code of Conduct to 2.0
914
- Setup Github Actions for package publishing
1015
- Setup Github Actions for build and testing
1116
- Move off Travis and Tox in favor of Github Actions

LICENSE

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 -- 2015 Christopher S. Corley
3+
Copyright (c) 2012 -- 2020 Christopher S. Corley
44

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

Makefile

Lines changed: 0 additions & 24 deletions
This file was deleted.

README.rst

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
What The Patch!?
22
================
33

4+
What The Patch!? is a library for both parsing and applying patch files.
5+
6+
Status
7+
------
8+
49
.. image:: https://github.com/cscorley/whatthepatch/workflows/Build/badge.svg
510

6-
What The Patch!? is a library for both parsing and applying patch files.
11+
This has been released as 1.0, but has never had much active development. The
12+
functions are stable and have been reliable for several years, even if they
13+
are not ideally implemented. Pull requests will always be considered, merged,
14+
and released; however, issues may not ever be fixed by the maintainer.
15+
16+
Contribute
17+
^^^^^^^^^^
18+
19+
#. Fork this repository
20+
#. Create a new branch to work on
21+
#. Commit your tests and/or changes
22+
#. Push and create a pull request here!
723

824
Features
9-
---------
25+
--------
1026

1127
- Parsing of almost all ``diff`` formats (except forwarded ed):
1228

@@ -25,7 +41,8 @@ Features
2541
Installation
2642
------------
2743

28-
To install What The Patch!?, simply:
44+
This library is available on `PyPI <https://pypi.org/project/whatthepatch/>`_
45+
and can be installed via pip:
2946

3047
.. code-block:: bash
3148
@@ -141,15 +158,8 @@ To apply a diff to some lines of text, first read the patch and parse it.
141158
'Deeper and more profound,',
142159
'The door of all subtleties!']
143160
144-
If apply does not satisfy your needs and you are on a system that has `patch`
145-
in `PATH`, you can also call `apply_diff(diff, lao, use_patch=True)`. The
146-
default is False, and patch is not necessary to apply diffs to text.
147-
148-
Contribute
149-
==========
150-
151-
#. Fork this repository
152-
#. Create a new branch to work on
153-
#. Commit your tests and/or changes
154-
#. Push and create a pull request here!
161+
If apply does not satisfy your needs and you are on a system that has
162+
``patch`` in ``PATH``, you can also call ``apply_diff(diff, lao,
163+
use_patch=True)``. The default is false, and patch is not necessary to apply
164+
diffs to text.
155165

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111

1212
setup(
1313
name="whatthepatch",
14-
version="0.0.6",
14+
version="1.0.0",
1515
author="Christopher S. Corley",
16-
author_email="cscorley@crimson.ua.edu",
16+
author_email="cscorley@gmail.com",
1717
description="A patch parsing and application library.",
1818
long_description=readme,
19-
long_description_content_type="text/markdown",
2019
url="https://github.com/cscorley/whatthepatch",
2120
license="MIT",
2221
packages=["whatthepatch"],
@@ -25,7 +24,7 @@
2524
classifiers=[
2625
"Operating System :: OS Independent",
2726
"License :: OSI Approved :: MIT License",
28-
"Development Status :: 3 - Alpha",
27+
"Development Status :: 5 - Production/Stable",
2928
"Intended Audience :: Developers",
3029
"Intended Audience :: Science/Research",
3130
"Topic :: Software Development",

0 commit comments

Comments
 (0)