From 5858d8fcb410dbd9b7e757ff7b775a9c0e2e707f Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 3 Jan 2023 19:00:05 +0800 Subject: [PATCH] remove liberapayID --- .gitlab-ci.yml | 1 + fdroidserver/index.py | 2 -- fdroidserver/metadata.py | 6 ------ locale/fi/LC_MESSAGES/fdroidserver.po | 4 ---- tests/metadata/dump/com.politedroid.yaml | 1 - tests/metadata/dump/org.adaway.yaml | 1 - tests/metadata/dump/org.smssecure.smssecure.yaml | 1 - tests/metadata/dump/org.videolan.vlc.yaml | 1 - tests/metadata/info.guardianproject.urzip.yml | 1 - tests/metadata/org.adaway.yml | 1 - tests/repo/index-v1.json | 1 - tests/repo/index.xml | 1 - tests/update.TestCase | 2 -- 13 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5575ebfc..dc046642 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,7 @@ metadata_v0: -e "s/ timeout:.'\([0-9]*\)'/ timeout:\1/" -e "/VercodeOperation/s/null/[]/" -e 's/VercodeOperation:.\([^[]\+\)/VercodeOperation:\n- \1/' + -e '/LiberapayID/d' metadata/dump_*/*.yaml - diff -uw metadata/dump_* diff --git a/fdroidserver/index.py b/fdroidserver/index.py index 7c079993..b598b2bd 100644 --- a/fdroidserver/index.py +++ b/fdroidserver/index.py @@ -553,7 +553,6 @@ def package_metadata(app, repodir): "Bitcoin", "FlattrID", "Liberapay", - "LiberapayID", "Litecoin", "OpenCollective", ): @@ -1173,7 +1172,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing addElementNonEmpty('bitcoin', app.Bitcoin, doc, apel) addElementNonEmpty('litecoin', app.Litecoin, doc, apel) addElementNonEmpty('flattr', app.FlattrID, doc, apel) - addElementNonEmpty('liberapay', app.LiberapayID, doc, apel) addElementNonEmpty('openCollective', app.OpenCollective, doc, apel) # These elements actually refer to the current version (i.e. which diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 296310aa..55fe954e 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -69,7 +69,6 @@ yaml_app_field_order = [ 'Donate', 'FlattrID', 'Liberapay', - 'LiberapayID', 'OpenCollective', 'Bitcoin', 'Litecoin', @@ -132,7 +131,6 @@ class App(dict): self.Donate = None self.FlattrID = None self.Liberapay = None - self.LiberapayID = None self.OpenCollective = None self.Bitcoin = None self.Litecoin = None @@ -404,10 +402,6 @@ valuetypes = { VALID_USERNAME_REGEX, ['Liberapay']), - FieldValidator("Liberapay ID", - r'^[0-9]+$', - ['LiberapayID']), - FieldValidator("Open Collective", VALID_USERNAME_REGEX, ['OpenCollective']), diff --git a/locale/fi/LC_MESSAGES/fdroidserver.po b/locale/fi/LC_MESSAGES/fdroidserver.po index ef109eee..eb36b726 100644 --- a/locale/fi/LC_MESSAGES/fdroidserver.po +++ b/locale/fi/LC_MESSAGES/fdroidserver.po @@ -1213,10 +1213,6 @@ msgstr "" msgid "Liberapay donation methods belong in the Liberapay: field" msgstr "" -#: ../fdroidserver/lint.py -msgid "Liberapay donation methods belong in the LiberapayID flag" -msgstr "" - #: ../fdroidserver/rewritemeta.py msgid "List files that would be reformatted" msgstr "" diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index 46a5cd6b..ebb6977f 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -161,7 +161,6 @@ Donate: null FlattrID: null IssueTracker: https://github.com/miguelvps/PoliteDroid/issues Liberapay: null -LiberapayID: null License: GPL-3.0-only Litecoin: null MaintainerNotes: '' diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index 8972dc17..a5411576 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -1088,7 +1088,6 @@ Donate: http://sufficientlysecure.org/index.php/adaway FlattrID: '369138' IssueTracker: https://github.com/dschuermann/ad-away/issues Liberapay: null -LiberapayID: '1234567890' License: GPL-3.0-only Litecoin: null MaintainerNotes: '' diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 3c20d20a..db476b66 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -378,7 +378,6 @@ Donate: null FlattrID: null IssueTracker: https://github.com/SMSSecure/SMSSecure/issues Liberapay: null -LiberapayID: null License: GPL-3.0-only Litecoin: null MaintainerNotes: '' diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index ef25d9a8..20e92b83 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -2541,7 +2541,6 @@ Donate: http://www.videolan.org/contribute.html#money FlattrID: null IssueTracker: http://www.videolan.org/support/index.html#bugs Liberapay: null -LiberapayID: null License: GPL-3.0-only Litecoin: null MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile diff --git a/tests/metadata/info.guardianproject.urzip.yml b/tests/metadata/info.guardianproject.urzip.yml index bab1d763..d35f7887 100644 --- a/tests/metadata/info.guardianproject.urzip.yml +++ b/tests/metadata/info.guardianproject.urzip.yml @@ -1,7 +1,6 @@ AutoName: Urzip：本地应用的信息 AutoUpdateMode: None Bitcoin: 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk -LiberapayID: '9999999' OpenCollective: f-droid-just-testing Categories: - Development diff --git a/tests/metadata/org.adaway.yml b/tests/metadata/org.adaway.yml index edfb2cd5..41bdb083 100644 --- a/tests/metadata/org.adaway.yml +++ b/tests/metadata/org.adaway.yml @@ -8,7 +8,6 @@ IssueTracker: https://github.com/dschuermann/ad-away/issues Translation: https://www.transifex.com/dominikschuermann/adaway Donate: http://sufficientlysecure.org/index.php/adaway FlattrID: '369138' -LiberapayID: '1234567890' AutoName: AdAway Summary: Block advertisements diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json index 257a815d..b103ba8d 100644 --- a/tests/repo/index-v1.json +++ b/tests/repo/index-v1.json @@ -204,7 +204,6 @@ "suggestedVersionCode": "2147483647", "description": "It\u2019s Urzip \u662f\u4e00\u4e2a\u83b7\u5f97\u5df2\u5b89\u88c5 APK \u76f8\u5173\u4fe1\u606f\u7684\u5b9e\u7528\u5de5\u5177\u3002\u5b83\u4ece\u60a8\u7684\u8bbe\u5907\u4e0a\u5df2\u5b89\u88c5\u7684\u6240\u6709\u5e94\u7528\u5f00\u59cb\uff0c\u4e00\u952e\u89e6\u6478\u5373\u53ef\u663e\u793a APK \u7684\u6307\u7eb9\uff0c\u5e76\u4e14\u63d0\u4f9b\u5230\u8fbe virustotal.com \u548c androidobservatory.org \u7684\u5feb\u6377\u94fe\u63a5\uff0c\u8ba9\u60a8\u65b9\u4fbf\u5730\u4e86\u89e3\u7279\u5b9a APK \u7684\u6863\u6848\u3002\u5b83\u8fd8\u53ef\u4ee5\u8ba9\u60a8\u5bfc\u51fa\u7b7e\u540d\u8bc1\u4e66\u548c\u751f\u6210 ApkSignaturePin Pin \u6587\u4ef6\u4f9b TrustedIntents \u5e93\u4f7f\u7528\u3002\n\n\u2605 Urzip \u652f\u6301\u4e0b\u5217\u8bed\u8a00\uff1a Deutsch, English, espa\u00f1ol, suomi, \u65e5\u672c\u8a9e, \ud55c\uad6d\uc5b4, Norsk, portugu\u00eas (Portugal), \u0420\u0443\u0441\u0441\u043a\u0438\u0439, Sloven\u0161\u010dina, T\u00fcrk\u00e7e\n\u6ca1\u770b\u5230\u60a8\u7684\u8bed\u8a00\uff1f\u5e2e\u5fd9\u7ffb\u8bd1\u672c\u5e94\u7528\u5427\uff1a\nhttps://www.transifex.com/projects/p/urzip\n\n\u2605 \u81f4\u7528\u6237\uff1a\u6211\u4eec\u8fd8\u7f3a\u5c11\u4f60\u559c\u6b22\u7684\u529f\u80fd\uff1f\u53d1\u73b0\u4e86\u4e00\u4e2a bug\uff1f\u8bf7\u544a\u8bc9\u6211\u4eec\uff01\u6211\u4eec\u4e50\u4e8e\u542c\u53d6\u60a8\u7684\u610f\u89c1\u3002\u8bf7\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u81f3: support@guardianproject.info \u6216\u8005\u52a0\u5165\u6211\u4eec\u7684\u804a\u5929\u5ba4 https://guardianproject.info/contact\n", "issueTracker": "https://dev.guardianproject.info/projects/urzip/issues", - "liberapayID": "9999999", "license": "GPL-3.0-only", "openCollective": "f-droid-just-testing", "sourceCode": "https://github.com/guardianproject/urzip", diff --git a/tests/repo/index.xml b/tests/repo/index.xml index 7c9a1cd6..31578bb0 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -388,7 +388,6 @@ https://www.transifex.com/projects/p/urzip https://github.com/guardianproject/urzip https://dev.guardianproject.info/projects/urzip/issues 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk - 9999999 f-droid-just-testing 2147483647 diff --git a/tests/update.TestCase b/tests/update.TestCase index d83e4b0a..76b2739f 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -1395,7 +1395,6 @@ class UpdateTest(unittest.TestCase): Changelog: Donate: FlattrID: - LiberapayID: Bitcoin: Litecoin: Name: @@ -1442,7 +1441,6 @@ class UpdateTest(unittest.TestCase): 'Donate': '', 'FlattrID': '', 'IssueTracker': '', - 'LiberapayID': '', 'License': '', 'Litecoin': '', 'Name': 'rocks.janicerand',