Skip to content

Commit 340675a

Browse files
Merge branch 'release-1.12'
2 parents 1462dfa + 98f751c commit 340675a

60 files changed

Lines changed: 1845 additions & 639 deletions

Some content is hidden

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

.flake8

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[flake8]
2+
ignore = E265, E266, E402, E501, E722, C901, N806
3+
max-line-length = 127
4+
max-complexity = 10
5+
count = True
6+
statistics = True
7+
show-source = True
8+
exclude = .git,build,dist,tests

.gitattributes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Declare files that will always have LF line endings on checkout.
5+
debian-startscript text eol=lf
6+
systemd-spunkybot.service text eol=lf
7+
debian/* text eol=lf
8+
setup.* text eol=lf

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Spunky Bot CODE OWNERS
2+
3+
# See https://help.github.com/articles/about-codeowners/ for more info about the CODEOWNERS file
4+
# Each line is a file pattern followed by one or more owners.
5+
6+
* @alexanderkress
File renamed without changes.

CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
If you want to get involved, whether in terms of asking a question, helping other users, introducing new people to Spunky Bot, or helping with the software or documentation, we appreciate your contributions to the project.
44

5-
6-
# Contributing Code (Features or Bugfixes)
5+
## Contributing Code (Features or Bugfixes)
76

87
The Spunky Bot project keeps its source on GitHub at [github.com/SpunkyBot/spunkybot](https://github.com/SpunkyBot/spunkybot).
98

@@ -15,7 +14,6 @@ We will then review your contributions and discuss issues with you.
1514

1615
Be patient, your request might not get merged right away, we also try to keep the development branch more or less usable, so we like to examine pull requests carefully, which takes time.
1716

18-
1917
Patches should always be made against the 'develop' branch.
2018

2119
Keep in mind that small and focused requests are easier to check and accept, having example cases also help us understand the utility of a bug fix or a new feature.
@@ -24,19 +22,16 @@ Contributions can be for new features like modules, or to fix bugs you or others
2422

2523
We like simple, readable code and consistent, conservatively extending, backwards-compatible improvements. The code developed for Spunky Bot must support Python 2.6+. Please also use a 4-space indent and no tabs. We do not enforce 80 characters lines, we are fine with 120-160.
2624

27-
28-
# Mailing List Information
25+
## Mailing List Information
2926

3027
The Spunky Bot [Mailing List](https://groups.google.com/group/spunkybot) is for sharing tips, answering questions, and general user discussions.
3128

32-
33-
# Community Code of Conduct
29+
## Community Code of Conduct
3430

3531
The Spunky Bot community welcomes users of all types, backgrounds, and skill levels. Please treat others in the way you expect to be treated, keep discussions positive and avoid discrimination of any kinds, profanity, or engaging in controversial debates.
3632

3733
Posts to mailing lists should remain focused on Spunky Bot and game server administration. Abuse of these community guidelines is not tolerated and may result in banning from community resources.
3834

35+
## Contributors License Agreement
3936

40-
# Contributors License Agreement
41-
42-
By contributing you agree that these contributions are your own, and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the [license](https://github.com/SpunkyBot/spunkybot/blob/master/LICENSE) of the project.
37+
By contributing you agree that these contributions are your own, and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the [license](https://github.com/SpunkyBot/spunkybot/blob/develop/LICENSE) of the project.

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github: alexanderkress
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: "\U0001F41B Bug report"
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Summary**
11+
Please describe the bug or the wrong behavior.
12+
13+
**Steps to reproduce**
14+
1.
15+
2.
16+
17+
**Expected behavior**
18+
Please describe what you expected to happen.
19+
20+
**Runtime Environment**
21+
* Spunky Bot version:
22+
* Python version:
23+
* Operating system:
24+
* How you installed Spunky Bot (DEB/PPA, pip, source):
25+
26+
**Log file / Screenshots / Console output**
27+
If applicable, add the devel.log file from your Spunky Bot installation folder, add screenshots or console output to help explain your problem.
28+
29+
**Additional context**
30+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository
2+
3+
blank_issues_enabled: true
4+
contact_links:
5+
- name: 📝 Spunky Bot Code of Conduct
6+
url: https://github.com/SpunkyBot/spunkybot/blob/develop/.github/CODE_OF_CONDUCT.md
7+
about: Be nice to other members of the community
8+
- name: 💬 Spunky Bot Mailing List / Users Forum
9+
url: https://groups.google.com/forum/#!forum/spunkybot
10+
about: Ask and discuss questions with community members
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: "\U0001F4DA Documentation"
3+
about: Improvements or additions to documentation
4+
title: ''
5+
labels: documentation
6+
assignees: ''
7+
8+
---
9+
10+
For typos and documentation fixes, please go ahead and:
11+
12+
* create an issue
13+
* fix the typo
14+
* submit a pull request
15+
16+
Thank you!
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "\U0001F680 Feature request"
3+
about: Suggest an idea for this project
4+
title: 'Feature Request: '
5+
labels: feature request
6+
assignees: ''
7+
8+
---
9+
10+
**Summary**
11+
Please describe what the problem is.
12+
13+
**Motivation**
14+
Please describe the solution and what you want to happen.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.

0 commit comments

Comments
 (0)