finished first aid maintenance

Signed-off-by: bigcat88 <bigcat88@icloud.com>
This commit is contained in:
Alexander Piskun
2023-05-17 23:21:18 +03:00
committed by bigcat88
parent b3a5520abb
commit ac7b67ef82
11 changed files with 71 additions and 41 deletions

View File

@ -4,16 +4,9 @@ root = true
trim_trailing_whitespace = true
insert_final_newline = true
charset = utf-8
max_line_length = 80
max_line_length = 120
end_of_line= lf
[*.{js,py}]
quote_type = single
[*.{json,html}]
quote_type = double
[*.{js,py,html,json}]
indent_style = space
indent_size = 4

View File

@ -2,30 +2,55 @@
* [Bernhard Posselt](mailto:dev@bernhard-posselt.com)
* [Jani Bonnevier](mailto:jani@bonnevier.one)
* [Adi Sieker](mailto:adi@sieker.io)
* [Lukas Reschke](mailto:lukas@statuscode.ch)
* [blizzz](mailto:blizzz@arthur-schiwon.de)
* [Alexander Piskun](mailto:13381981+bigcat88@users.noreply.github.com)
* [Morris Jobke](mailto:hey@morrisjobke.de)
* [Julius Härtl](mailto:github@jus.li)
* [Patrizio Bekerle](mailto:patrizio@bekerle.com)
* [Allan Nordhøy](mailto:epost@anotheragency.no)
* [Adi Sieker](mailto:adi@sieker.io)
* [Carl Schwan](mailto:carl@carlschwan.eu)
* [Valdnet](mailto:47037905+Valdnet@users.noreply.github.com)
* [Lukas Reschke](mailto:lukas@statuscode.ch)
* [Julius Härtl](mailto:jus@bitgrid.net)
* [Mario Danic](mailto:mario@lovelyhq.com)
* [Arthur Schiwon](mailto:blizzz@arthur-schiwon.de)
* [Vitor Mattos](mailto:vitor@php.rio)
* [Joas Schilling](mailto:213943+nickvergessen@users.noreply.github.com)
* [Mario Đanić](mailto:mario@lovelyhq.com)
* [Christoph Wurst](mailto:ChristophWurst@users.noreply.github.com)
* [Roeland Jago Douma](mailto:rullzer@users.noreply.github.com)
* [Allan Nordhøy](mailto:epost@anotheragency.no)
* [Daphne Muller](mailto:86835268+DaphneMuller@users.noreply.github.com)
* [Julius Härtl](mailto:github@jus.li)
* [Mario Đanić](mailto:mario.danic@gmail.com)
* [Patrizio Bekerle](mailto:patrizio@bekerle.com)
* [rakekniven](mailto:mark.ziegler@rakekniven.de)
* [Jannick Hemelhof](mailto:clone1612@me.com)
* [Joas Schilling](mailto:coding@schilljs.com)
* [Marius Blüm](mailto:marius@lineone.io)
* [Olivier Paroz](mailto:oparoz@users.noreply.github.com)
* [Joas Schilling](mailto:coding@schilljs.com)
* [rakekniven](mailto:2069590+rakekniven@users.noreply.github.com)
* [Christian Wolf](mailto:github@christianwolf.email)
* [Côme Chilliet](mailto:come.chilliet@nextcloud.com)
* [Gary Kim](mailto:gary@garykim.dev)
* [Jos Poortvliet](mailto:jos@opensuse.org)
* [blizzz](mailto:blizzz@arthur-schiwon.de)
* [Maxence Lange](mailto:maxence@artificial-owl.com)
* [Yasser Tahiri](mailto:yasserth19@gmail.com)
* [comradekingu](mailto:epost@anotheragency.no)
* [fossxplorer](mailto:fossxplorer@gmail.com)
* [rakekniven](mailto:mark.ziegler@rakekniven.de)
* [Christoph Wurst](mailto:christoph@winzerhof-wurst.at)
* [David Peach](mailto:mail@davidpeach.co.uk)
* [Felix Wolfsteller](mailto:felix.wolfsteller@gmail.com)
* [Franz Dietrich](mailto:dietrich@teilgedanken.de)
* [Ilya Sher](mailto:ilya.sher@coding-knight.com)
* [Jannick Hemelhof](mailto:jhemelho@vub.ac.be)
* [Jonne Haß](mailto:me@jhass.eu)
* [Julius Härtl](mailto:jus@bitgrid.net)
* [Matthieu Gallien](mailto:matthieu.gallien@nextcloud.com)
* [Maxence Lange](mailto:maxence@pontapreta.net)
* [Roeland Jago Douma](mailto:roeland@famdouma.nl)
* [Sander](mailto:brantje@gmail.com)
* [Susinthiran Nathan](mailto:fossxplorer@gmail.com)
* [Thomas Wouters](mailto:twouters@users.noreply.github.com)
* [bakkegaard](mailto:nickbakkegaard@gmail.com)
* [bigcat88](mailto:bigcat88@icloud.com)
* [simonspa](mailto:1677436+simonspa@users.noreply.github.com)
* [wiswedel](mailto:wiswedel@users.noreply.github.com)
* [woopsix](mailto:46693847+woopsix@users.noreply.github.com)

View File

@ -1,4 +1,5 @@
{% verbatim %}# This workflow is provided via the organization template repository
{% verbatim %}
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

View File

@ -1,3 +1,4 @@
{% verbatim %}
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
@ -21,7 +22,7 @@ jobs:
name: info.xml lint
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v3
- name: Download schema
run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd
@ -31,3 +32,4 @@ jobs:
with:
xml-file: ./appinfo/info.xml
xml-schema-file: ./info.xsd
{% endverbatim %}

View File

@ -1,4 +1,5 @@
{% verbatim %}# This workflow is provided via the organization template repository
{% verbatim %}
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
@ -22,7 +23,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2

View File

@ -1,4 +1,5 @@
{% verbatim %}# This workflow is provided via the organization template repository
{% verbatim %}
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
@ -25,7 +26,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2

View File

@ -1,4 +1,5 @@
{% verbatim %}# This workflow is provided via the organization template repository
{% verbatim %}
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
@ -22,14 +23,14 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@v1.1
id: versions
with:
fallbackNode: '^12'
fallbackNpm: '^6'
fallbackNode: '^16'
fallbackNpm: '^7'
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v2

View File

@ -1,3 +1,4 @@
{% verbatim %}
# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. <https://fsfe.org>
#
# SPDX-License-Identifier: CC0-1.0
@ -10,6 +11,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v1
{% endverbatim %}

View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "nextcloudappstore"
version = "4.0.0"
version = "4.1.0"
description = "App store for Nextcloud apps"
authors = ["Morris Jobke <hey@morrisjobke.de>"]
@ -27,7 +27,7 @@ uWSGI = "^2.0.20"
newrelic = "^7.2.4"
psycopg2 = "^2.9.3"
[tool.poetry.dev-dependencies]
[tool.poetry.dev.dependencies]
pytest = "*"
pytest-cov = "*"
pytest-django = "*"
@ -40,7 +40,7 @@ types-requests = "^2.26.3"
types-pyOpenSSL = "^23.0.0"
[build-system]
requires = ["poetry>=1.3.1"]
requires = ["poetry>=1.4.2"]
build-backend = "poetry.masonry.api"
[tool.black]

View File

@ -12,11 +12,16 @@ def get_git_authors() -> List[str]:
return authors.decode("utf-8").split("\n")
def parse_git_author(line: str) -> Dict[str, str]:
format_regex = r"^\s*(?P<commit_count>\d+)\s*(?P<name>.*\w)\s*<(" r"?P<email>[^\s]+)>$"
def append_git_author(line: str, result_list: list[dict]) -> None:
ignore = ["nextcloud bot", "[bot]"]
format_regex = r"^\s*(?P<commit_count>\d+)\s*(?P<name>.*?)\s*<(" r"?P<email>[^\s]+)>$"
result = re.search(format_regex, line)
if result:
return {"commits": result.group("commit_count"), "name": result.group("name"), "email": result.group("email")}
name = result.group("name")
for i in ignore:
if name.lower().find(i) != -1:
return
result_list.append({"commits": result.group("commit_count"), "name": name, "email": result.group("email")})
else:
raise ValueError("Could not extract authors from line %s" % line)
@ -25,14 +30,14 @@ def to_markdown(authors: Iterator[Dict[str, str]]) -> Tuple[str, str]:
result = ["# Authors", ""]
for author in authors:
result += ["* [%s](mailto:%s)" % (author["name"], author["email"])]
return "\n".join(result), "md"
return "\n".join(result) + "\n", "md"
def to_rst(authors: Iterator[Dict[str, str]]) -> Tuple[str, str]:
result = ["Authors", "=======", ""]
for author in authors:
result += ["* `%s <mailto:%s>`_" % (author["name"], author["email"])]
return "\n".join(result), "rst"
return "\n".join(result) + "\n", "rst"
def get_authors_file(suffix: str) -> str:
@ -42,11 +47,10 @@ def get_authors_file(suffix: str) -> str:
def main() -> None:
ignore = {"Nextcloud bot"}
authors = get_git_authors()
authors = filter(lambda name: name.strip() != "", authors)
authors = [parse_git_author(author) for author in authors]
authors = filter(lambda author: author["name"] not in ignore, authors)
authors = []
for author in get_git_authors():
if author:
append_git_author(author, authors)
text, extension = to_markdown(authors)
with open(get_authors_file(extension), "w") as f:
f.write(text)