diff --git a/.readthedocs.yml b/.readthedocs.yml deleted file mode 100644 index d29d49b..0000000 --- a/.readthedocs.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: 2 -sphinx: - configuration: docs/source/conf.py - -python: - version: 3 - install: - - requirements: requirements.txt diff --git a/ChangeLog b/ChangeLog index 1d6e6cf..7cb22ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,3 @@ -2022-09-24 Jan Dittberner - * add updated translations from Weblate - * update dependencies - * replace gpg and pgp with OpenPGP (thanks Guillem Jover) - * remove flattr code - -2021-10-24 Jan Dittberner - * add updated translations from Weblate - * fix NM URL (thanks Diederik de Haas) - -2021-07-03 Jan Dittberner - * Add translations from Weblate - * remove a dead services (thanks Juri Grabowski) - 2020-02-22 Jan Dittberner * Update translations diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py index fc3d132..24872ee 100644 --- a/debianmemberportfolio/forms.py +++ b/debianmemberportfolio/forms.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service views # -# Copyright © 2015-2022 Jan Dittberner +# Copyright © 2015-2020 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -51,7 +51,7 @@ def gpg_fingerprint(data): class DeveloperData(FlaskForm): email = StringField('email', validators=[DataRequired(), Email()]) name = StringField('name', validators=[Optional(), DataRequired()]) - openpgpfp = StringField('openpgpfp', filters=[gpg_fingerprint], validators=[ + gpgfp = StringField('gpgfp', filters=[gpg_fingerprint], validators=[ Optional(), FingerPrint(), Length(min=32, max=40) ]) username = StringField('username', validators=[Optional(), PlainText()]) diff --git a/debianmemberportfolio/model/dddatabuilder.py b/debianmemberportfolio/model/dddatabuilder.py index 1fa5be1..c168489 100644 --- a/debianmemberportfolio/model/dddatabuilder.py +++ b/debianmemberportfolio/model/dddatabuilder.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service data builder # -# Copyright © 2009-2022 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -39,13 +39,13 @@ def build_data(email_address): """Build a DD data structure from a given email address.""" fields = dict([(field, func(str(email_address))) for (field, func) in - [('openpgpfp', keyfinder.getFingerprintByEmail), + [('gpgfp', keyfinder.getFingerprintByEmail), ('name', keyfinder.getRealnameByEmail), ('username', keyfinder.getLoginByEmail)]]) fields['email'] = email_address - if fields['username'] and fields['openpgpfp'] and fields['name']: + if fields['username'] and fields['gpgfp'] and fields['name']: fields['type'] = TYPE_DD - elif fields['name'] and fields['openpgpfp']: + elif fields['name'] and fields['gpgfp']: fields['type'] = TYPE_DM else: fields['type'] = TYPE_NO diff --git a/debianmemberportfolio/model/keyfinder.py b/debianmemberportfolio/model/keyfinder.py index c4b8a54..5129e54 100644 --- a/debianmemberportfolio/model/keyfinder.py +++ b/debianmemberportfolio/model/keyfinder.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service key finder module # -# Copyright © 2009-2022 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -21,7 +21,7 @@ # along with this program. If not, see . # """ -This module provides tools for finding OpenPGP key information from a +This module provides tools for finding PGP key information from a given keyring. """ diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini index 6baedad..7cf278a 100644 --- a/debianmemberportfolio/model/portfolio.ini +++ b/debianmemberportfolio/model/portfolio.ini @@ -1,7 +1,7 @@ # # Configuration for Debian Member Portfolio Service # -# Copyright © 2009-2022 Jan Dittberner +# Copyright © 2009-2020 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -44,13 +44,13 @@ urls=buildd buildd.pattern=https://buildd.debian.org/status/package.php?p=%(email)s&compact=compact&comaint=yes [qa] -urls=lintian,lintianfull,piuparts,dmd,janitor +urls=lintian,lintianfull,piuparts,patchtracker,dmd,duck,janitor dmd.pattern=https://udd.debian.org/dmd.cgi?email1=%(email)s lintian.pattern=https://lintian.debian.org/maintainer/%(email)s.html lintianfull.pattern=https://lintian.debian.org/full/%(email)s.html piuparts.pattern=https://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html -#patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s -#duck.pattern=http://duck.debian.net/persons/%(email)s.html +patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s +duck.pattern=http://duck.debian.net/persons/%(email)s.html janitor.pattern=https://janitor.debian.net/m/%(email)s [lists] @@ -69,15 +69,15 @@ people.pattern=https://people.debian.org/~%(username)s/ people.optional=true [membership] -urls=nm,dbfinger,db,salsa,wiki,forum -nm.pattern=https://nm.debian.org/person/%(username)s +urls=nm,dbfinger,db,webid,salsa,wiki,forum +nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s dbfinger.pattern=finger %(username)s@db.debian.org dbfinger.type=finger dbfinger.optional=true db.pattern=https://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search db.optional=true -#webid.pattern=http://webid.debian.net/maintainers/%(username)s -#webid.optional=true +webid.pattern=http://webid.debian.net/maintainers/%(username)s +webid.optional=true salsa.pattern=https://salsa.debian.org/%(salsausername)s salsa.optional=true wiki.pattern=https://wiki.debian.org/%(wikihomepage)s @@ -96,7 +96,7 @@ search.pattern=https://search.debian.org/cgi-bin/omega?P=%%22%(name)s%%22 gpgfinger.pattern=finger %(username)s/key@db.debian.org gpgfinger.type=finger gpgfinger.optional=true -gpgweb.pattern=https://db.debian.org/fetchkey.cgi?fingerprint=%(openpgpfp)s +gpgweb.pattern=https://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s gpgweb.optional=true nm.pattern=https://nm.debian.org/public/person/%(username)s contrib.pattern=https://contributors.debian.org/contributor/%(email)s @@ -119,6 +119,6 @@ groupinfo.pattern=ssh master.debian.org id %(username)s groupinfo.type=ssh groupinfo.optional=true -#[ubuntu] -#urls=ubuntudiff -#ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s +[ubuntu] +urls=ubuntudiff +ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s diff --git a/debianmemberportfolio/model/urlbuilder.py b/debianmemberportfolio/model/urlbuilder.py index d350021..cb2f33f 100644 --- a/debianmemberportfolio/model/urlbuilder.py +++ b/debianmemberportfolio/model/urlbuilder.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service url builder # -# Copyright © 2009-2022 Jan Dittberner +# Copyright © 2009-2020 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -42,7 +42,7 @@ my_config.read_file(UTF8StreamReader( _FIELDNAMES_MAP = { 'email': N_('Email address'), 'name': N_('Name'), - 'openpgpfp': N_('OpenPGP fingerprint'), + 'gpgfp': N_('GPG fingerprint'), 'username': N_('Debian user name'), 'nonddemail': N_('Non Debian email address'), 'salsausername': N_('Salsa user name'), @@ -75,10 +75,10 @@ def _build_quoted_fields(fields): qfields[key] = value qfields[key] = str(qfields[key]).replace('%', '%%') - if 'openpgpfp' not in qfields: + if 'gpgfp' not in qfields: fpr = keyfinder.getFingerprintByEmail(fields['email'].encode('utf8')) if fpr: - qfields['openpgpfp'] = fpr[0] + qfields['gpgfp'] = fpr[0] qfields['firstchar'] = fields['email'][0].encode('utf8') qfields['emailnoq'] = fields['email'].encode('utf8') return qfields diff --git a/debianmemberportfolio/templates/base.html b/debianmemberportfolio/templates/base.html index c8d1bc1..82986b7 100644 --- a/debianmemberportfolio/templates/base.html +++ b/debianmemberportfolio/templates/base.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> {# vim: ft=jinja Base template for XHTML templates. -Copyright © 2009-2022 Jan Dittberner +Copyright © 2009-2020 Jan Dittberner This file is part of the Debian Member Portfolio service. @@ -38,7 +38,11 @@ with this program. If not, see . + + diff --git a/debianmemberportfolio/templates/showform.html b/debianmemberportfolio/templates/showform.html index 6bc3191..a0d091a 100644 --- a/debianmemberportfolio/templates/showform.html +++ b/debianmemberportfolio/templates/showform.html @@ -2,7 +2,7 @@ {# Template for the data input form. -Copyright © 2009-2022 Jan Dittberner +Copyright © 2009-2020 Jan Dittberner This file is part of the Debian Member Portfolio service. @@ -46,12 +46,12 @@ with this program. If not, see .
{{ form.name }} -
-