Skip to content

Commit ae7df14

Browse files
authored
Merge pull request #1843 from UlrichB22/contrib
Rename and update README, add CONTRIBUTING.md
2 parents 76c451f + 1705080 commit ae7df14

File tree

5 files changed

+160
-58
lines changed

5 files changed

+160
-58
lines changed

CONTRIBUTING.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Contributing to MoinMoin
2+
3+
Thank you for your interest in contributing to MoinMoin! We welcome contributions
4+
and appreciate your support in improving this project. This guide outlines how
5+
you can contribute, whether through bug reports, code contributions or help with
6+
documentation.
7+
8+
9+
## How to contribute
10+
11+
Find out how you can start reporting bugs, fixing bugs, adding new features or
12+
improving the documentation.
13+
14+
### Reporting bugs
15+
16+
If you've encountered a bug, please report it by following these steps:
17+
18+
1. Search the issue tracker to see if the bug has already been reported.
19+
2. Open a new issue in GitHub if it has not been reported yet.
20+
3. Provide as much detail as possible, including:
21+
- A description of the bug
22+
- Steps to reproduce the issue
23+
- Any relevant logs or error messages
24+
25+
### Suggesting enhancements
26+
27+
If you have an idea for a new feature or improvement:
28+
29+
1. Check the issue tracker to see if the enhancement has already been suggested.
30+
2. Open a new issue with a detailed description of the suggested enhancement.
31+
3. Include a rough idea of how the enhancement could be implemented if possible.
32+
33+
### Submitting code or documentation enhancements
34+
35+
To submit code or documentation updates, follow these steps:
36+
37+
* Setup your development environment, see next chapter.
38+
* Create a new branch for your changes:
39+
```
40+
git checkout -b feature-branch
41+
```
42+
* Implement your changes locally.
43+
* Run tests and ensure everything works before submitting your changes.
44+
* Commit your changes and push them to your fork on GitHub:
45+
```
46+
git commit -am "Description of changes"
47+
git push --set-upstream origin feature-branch
48+
```
49+
* Create a pull request against the master MoinMoin repository.
50+
51+
We encourage you to split complex changes into smaller, focused pull requests.
52+
This makes it easier to review and merge your contributions.
53+
54+
## Development setup
55+
56+
To begin contributing, you need to set up your development environment. Follow
57+
the steps below to get started:
58+
59+
* Fork the main moin repository from GitHub
60+
* Clone your repo to your local development system
61+
* Create a virtualenv and download Python packages
62+
* Activate the virtualenv
63+
* Create a wiki instance with help data and a welcome page
64+
* Start the built-in server
65+
66+
For details on setting up your environment, please refer to the MoinMoin
67+
development documentation at
68+
[moin-20.readthedocs.io](https://moin-20.readthedocs.io/en/latest/devel/development.html#create-your-development-environment)
69+
70+
71+
## Code Style and Best Practices
72+
73+
MoinMoin follows some common coding standards to ensure the consistency of the
74+
code base. Here are some major things to keep in mind:
75+
76+
* Python Version: MoinMoin is based on Python 3. Make sure your changes work
77+
with the versions specified in pyproject.toml.
78+
* Code Formatting: Follow PEP 8 standards for Python code.
79+
* Testing: Write tests for your changes to ensure stability. Tests should be
80+
added under the corresponding _tests directory.
81+
* Documentation: Ensure that your changes are well-documented. Add docstrings
82+
to your functions and classes where appropriate.
83+
84+
We have added Git pre-commit hooks to ensure a consistent code quality.
85+
The checks include the use of the tools black, ruff and bandit. For details please see
86+
[moin-20.readthedocs.io](https://moin-20.readthedocs.io/en/latest/devel/development.html#install-pre-commit-hooks)
87+
88+
89+
## Licensing
90+
91+
By submitting code to MoinMoin, you agree that your contributions are licensed
92+
under the GNU General Public License, the license used by the MoinMoin project.
93+
94+
We appreciate your contributions to MoinMoin! If you have any questions that
95+
are not covered in the docs, feel free to ask.

README.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
MoinMoin - a lightweight open source wiki engine
2+
================================================
3+
4+
<img src="src/moin/static/logos/moinmoin.svg" alt="MoinMoin Logo" width="120" align="right">
5+
6+
MoinMoin is an easy to use, full-featured and extensible wiki software package
7+
written in Python. You can run it on all common operating systems (Windows,
8+
macOS, Linux, etc.).
9+
10+
This wiki software can fulfill a wide range of roles, such as a personal notes
11+
organizer deployed on a laptop or home web server, a company knowledge base
12+
deployed on an intranet, or an Internet server open to individuals sharing the
13+
same interests, goals or projects.
14+
15+
16+
Documentation and Support
17+
=========================
18+
19+
> [!NOTE]
20+
moin2 is not released yet.
21+
22+
You will find the latest docs at https://moin-20.readthedocs.io/en/latest.
23+
24+
There is a wiki page collecting all moin2 specific information, links to
25+
support resources and info about MoinMoin development status and plans:
26+
https://moinmo.in/MoinMoin2.0
27+
28+
In general, you should make sure that the documentation you are reading
29+
is written for the moin version you are using. Much of the information
30+
you find in the wiki refers to moin 1.9 and does not apply to moin2.
31+
32+
For support, please try the documentation, the homepage, the irc channel,
33+
the mailing lists and the github issues before contacting the MoinMoin
34+
authors directly.
35+
36+
If you have trouble with any web server configuration, please try reading
37+
the web server's documentation. Same thing applies for any other 3rd party
38+
software usually used with moin, but not written by the MoinMoin developers.
39+
40+
41+
Contributing
42+
============
43+
44+
You're welcome to help us make MoinMoin even better! Whether you have experience
45+
with Python, HTML or CSS or are just starting out, there are many ways you
46+
can contribute - please see [CONTRIBUTING.md](./CONTRIBUTING.md).
47+
48+
49+
Acknowledgements
50+
================
51+
52+
We have to thank a lot of people for their valuable ideas, time and
53+
contributions - please see [contributors](https://github.com/moinwiki/moin/graphs/contributors).

README.rst

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

docs/devel/development.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ Development
55
Useful Resources
66
================
77

8-
IRC channels on chat.freenode.net (quick communication and discussion):
9-
10-
* #moin-dev (core development topics)
11-
* #moin (user support, extensions)
12-
13-
Wikis:
14-
15-
* https://moinmo.in/ (production wiki, using moin 1.9)
8+
If you have any questions about MoinWiki you can use the following resources:
169

1710
Documentation (installation, configuration, user docs, api reference):
1811

1912
* https://moin-20.readthedocs.io/en/latest/
2013

21-
Repository, Issue tracker (bugs, proposals, todo), Code Review, etc.:
14+
Repository, Issue tracker (bugs, proposals, todo), Code Review, Discussions, etc.:
2215

2316
* https://github.com/moinwiki/moin
2417

18+
Wiki:
19+
20+
* https://moinmo.in/MoinMoin2.0 (production wiki, using moin 1.9)
21+
22+
IRC channel on libera.chat (quick communication and discussion):
23+
24+
* #moin (Web Chat: https://web.libera.chat/?#moin)
25+
2526

2627
Requirements for development
2728
============================
@@ -44,7 +45,7 @@ You can also find GUI clients there.
4445
Typical development workflow
4546
============================
4647

47-
This is the typical workflow for anyone that wants to contribute to the development of Moin2.
48+
This is the typical workflow for anyone who wants to contribute to the development of Moin2.
4849

4950
create your development environment
5051
-----------------------------------

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ maintainers = [
77
{name="Thomas Waldmann", email="[email protected]"},
88
]
99
description = "MoinMoin is an easy to use, full-featured and extensible wiki software package"
10-
readme = {file="README.rst", content-type="text/x-rst"}
10+
readme = {file="README.md", content-type="text/markdown"}
1111
requires-python = ">=3.9"
1212
keywords = ["wiki", "web"]
1313
classifiers = [

0 commit comments

Comments
 (0)