Commit graph

9126 commits

Author SHA1 Message Date
gfbdrgng
0b40c04422 Translated using Weblate: Russian (ru) by gfbdrgng <hnaofegnp@hldrive.com>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: gfbdrgng <hnaofegnp@hldrive.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translation: F-Droid/F-Droid Server
2024-11-26 22:03:01 +01:00
Reno Tx
4ea9cdfa93
Translated using Weblate: Serbian (sr) by Reno Tx <renotx@users.noreply.hosted.weblate.org>
Currently translated at 96.8% (592 of 611 strings)

Co-authored-by: Reno Tx <renotx@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sr/
Translation: F-Droid/F-Droid Server
2024-11-26 19:01:59 +01:00
Michael Pöhn
e52a07d63a Merge branch 'install-fixes' into 'master'
install: fix breakage in downloading from Maven Central, GitHub Releases

See merge request fdroid/fdroidserver!1572
2024-11-26 15:15:59 +00:00
Hans-Christoph Steiner
8fc340aaca install: fix download dir when fetching from GitHub Releases 2024-11-26 15:31:47 +01:00
Hans-Christoph Steiner
8c81033ea3 FDroidPopenBytes: do not crash if options are not set
This makes writing test cases a lot easier. For example:

======================================================================
ERROR: test_devices (tests.test_install.InstallTest.test_devices)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hans/code/fdroid/server/tests/test_install.py", line 31, in test_devices
    devices = fdroidserver.install.devices()
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/hans/code/fdroid/server/fdroidserver/install.py", line 225, in devices
    p = common.SdkToolsPopen(['adb', "devices"])
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/hans/code/fdroid/server/fdroidserver/common.py", line 2921, in SdkToolsPopen
    return FDroidPopen([abscmd] + commands[1:],
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/hans/code/fdroid/server/fdroidserver/common.py", line 3024, in FDroidPopen
    result = FDroidPopenBytes(commands, cwd, envs, output, stderr_to_stdout)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/hans/code/fdroid/server/fdroidserver/common.py", line 2987, in FDroidPopenBytes
    if output and options.verbose:
                  ^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'verbose'
2024-11-26 15:20:06 +01:00
Hans-Christoph Steiner
d2cc020336 install: fix broken URL building logic for Maven Central
The append logic was wrong, so it was trying to download URLs like:
https://repo.maven.apache.org/maven2/org/fdroid/fdroid/F-Droid/maven-metadata.xml/org/fdroid/fdroid/F-Droid/1.20.0/F-Droid-1.20.0.apk

Which should be:
https://repo.maven.apache.org/maven2/org/fdroid/fdroid/F-Droid/1.20.0/F-Droid-1.20.0.apk

Can be manually tested using:
`test_download_fdroid_apk=1 python -m unittest -k test_download_fdroid_apk_from_maven`
2024-11-26 15:14:18 +01:00
Hans-Christoph Steiner
a2d27ba15e
install: remove forgotten print() 2024-11-26 11:17:46 +01:00
Michael Pöhn
a9c6eeb753 Merge branch 'fix-1543' into 'master'
buildserver/provision-apt-get-install: install python3-magic for scanner

See merge request fdroid/fdroidserver!1571
2024-11-25 18:43:01 +00:00
Hans-Christoph Steiner
9b2a4a90a7 buildserver/provision-apt-get-install:
This was forgotten in !1543

ansible-role-install-fdroidserver-dependencies!11
2024-11-25 19:21:07 +01:00
Hans-Christoph Steiner
fe29f56238
version 2.3.1 2024-11-25 17:38:02 +01:00
Hans-Christoph Steiner
a26995e534
update CHANGELOG.md for 2.3.0 and 2.3.1 2024-11-25 17:35:39 +01:00
Hans-Christoph Steiner
25bd35a166 Merge branch 'weblate' into 'master'
weblate

See merge request fdroid/fdroidserver!1570
2024-11-25 15:42:28 +00:00
大王叫我来巡山
865c7a33bb Translated using Weblate: Chinese (Simplified Han script) (zh_Hans) by 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
Besnik Bleta
e61ee39ee4 Translated using Weblate: Albanian (sq) by Besnik Bleta <besnik@programeshqip.org>
Currently translated at 97.5% (596 of 611 strings)

Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/sq/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
gfbdrgng
e162278143 Translated using Weblate: Russian (ru) by gfbdrgng <hnaofegnp@hldrive.com>
Currently translated at 98.3% (601 of 611 strings)

Co-authored-by: gfbdrgng <hnaofegnp@hldrive.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ru/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
dedakir923
4b53f4b1d3 Translated using Weblate: Portuguese (Brazil) (pt_BR) by dedakir923 <dedakir923@exoular.com>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: dedakir923 <dedakir923@exoular.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
LucasMZ
04f8058dfc Translated using Weblate: Portuguese (Brazil) (pt_BR) by LucasMZ <git@lucasmz.dev>
Currently translated at 97.7% (597 of 611 strings)

Co-authored-by: LucasMZ <git@lucasmz.dev>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
Aindriú Mac Giolla Eoin
46dd2227e9 Translated using Weblate: Irish (ga) by Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ga/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
Sylvain Pichon
8ee15b9cac Translated using Weblate: French (fr) by Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>
Currently translated at 92.7% (567 of 611 strings)

Co-authored-by: Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
Sylvain Pichon
13db3f7018 Translated using Weblate: French (fr) by Sylvain Pichon <service@spichon.fr>
Currently translated at 92.6% (566 of 611 strings)

Translated using Weblate: French (fr) by Sylvain Pichon <service@spichon.fr>

Currently translated at 92.1% (563 of 611 strings)

Co-authored-by: Sylvain Pichon <service@spichon.fr>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
gallegonovato
a9c9825727 Translated using Weblate: Spanish (es) by gallegonovato <fran-carro@hotmail.es>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/es/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
VfBFan
696f68a99d Translated using Weblate: German (de) by VfBFan <VfBFan@users.noreply.hosted.weblate.org>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: VfBFan <VfBFan@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
Fjuro
bb911bf4f3 Translated using Weblate: Czech (cs) by Fjuro <fjuro@alius.cz>
Currently translated at 100.0% (611 of 611 strings)

Co-authored-by: Fjuro <fjuro@alius.cz>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/cs/
Translation: F-Droid/F-Droid Server
2024-11-25 16:30:51 +01:00
Jochen Sprickerhof
67e27cc706 Merge branch 'optional-deps-for-macOS' into 'master'
install biplist and pycountry by default on macOS

See merge request fdroid/fdroidserver!1569
2024-11-25 14:39:34 +00:00
Hans-Christoph Steiner
1b0fabe8f5 install biplist and pycountry by default on macOS
* biplist is only used for Apple iOS IPA files.
* pycountry is only used for linting countryCodes in mirror configs.

Both of these are included via the Debian packaging, where those packages
and updates are more vetted.  Homebrew for macOS makes it very difficult to
include optional dependencies, so this includes the optional dependencies
via distutils' method.
2024-11-25 15:28:43 +01:00
Jochen Sprickerhof
cd29dd84d2 Merge branch 'drop_imghdr' into 'master'
scanner: replace deprecated imghdr with libmagic/puremagic

See merge request fdroid/fdroidserver!1543
2024-11-25 13:57:06 +00:00
Jochen Sprickerhof
8a5359ab3f scanner: replace deprecated imghdr with libmagic/puremagic
libmagic's Python bindings detect more types, puremagic is pure Python.

imghdr was dropped in Python 3.13.

This reverts commit 3bc246ccad.
2024-11-25 13:26:38 +01:00
Hans-Christoph Steiner
432618eb03 Merge branch 'master' into 'master'
post release translation updates

See merge request fdroid/fdroidserver!1568
2024-11-21 20:45:45 +00:00
Hans-Christoph Steiner
4d3feb93e3
make -C locale update 2024-11-21 21:35:26 +01:00
Doctorredits_here
732a945fa3
Translated using Weblate: Indonesian (id) by Doctorredits_here <alkaf.alkaf2018@tutamail.com>
Currently translated at 16.8% (100 of 592 strings)

Co-authored-by: Doctorredits_here <alkaf.alkaf2018@tutamail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/id/
Translation: F-Droid/F-Droid Server
2024-11-21 21:35:23 +01:00
Cool Man
069f75b3d5
Translated using Weblate: Arabic (ar) by Cool Man <mcool3273@gmail.com>
Currently translated at 5.5% (33 of 592 strings)

Co-authored-by: Cool Man <mcool3273@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/ar/
Translation: F-Droid/F-Droid Server
2024-11-21 21:35:19 +01:00
Hans-Christoph Steiner
6ff1c9733c
include tests/__init__.py in dist tarball 2024-11-21 21:35:16 +01:00
Hans-Christoph Steiner
d69028e1b1 Merge branch 'master' into 'master'
release 2.3.0

See merge request fdroid/fdroidserver!1567
2024-11-21 16:01:50 +00:00
Hans-Christoph Steiner
eae5ae3ae8
version 2.3.0 2024-11-21 16:49:01 +01:00
Hans-Christoph Steiner
37dc6c121d run tests/refresh-SUSS_DEFAULT.py 2024-11-21 15:23:29 +01:00
Hans-Christoph Steiner
2a6d584713 Merge branch 'gradle-release-checksums.py' into 'master'
update to gradle v8.11.1

See merge request fdroid/fdroidserver!1566
2024-11-21 12:48:17 +00:00
fdroid-bot
50b686b33b gradle v8.11.1 2024-11-21 12:26:23 +00:00
linsui
9203941b78 Merge branch 'fix-checkupdates-one-MR-per-app' into 'master'
checkupdates: reuse per-app branches when making merge requests; plus bug fixes

See merge request fdroid/fdroidserver!1551
2024-11-21 12:25:47 +00:00
Hans-Christoph Steiner
0ec9cd6921 checkupdates: only update app branches if metadata file changed 2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
e3f724681a checkupdates: parse default branch from upstream remote 2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
fd15ac9276 checkupdates: mark as Draft when only changing Current Version
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1551#note_2190155816
2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
c97503b5f3 checkupdates: get default branch from git config 2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
fbe9152ee5 checkupdates: commit summary is merge request title 2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
cd8d4ef88b checkupdates: reuse per-app branches when making merge requests
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1551#note_2206085258
2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
20ff302e89 checkupdates: remove duplicate push in push_commits() 2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
17c480d299 checkupdates: make iter_commits only include commits in appid branch
iter_commits() follows `git rev-list` (which selects different commits
than `git diff`).  With ... notation, `git rev-list` will return all
the commits that are not shared by the two branches.  This needs only
the commits in the right side of the comparison (like how `git diff`
does it).
2024-11-21 12:15:14 +00:00
Hans-Christoph Steiner
f34a132132 Merge branch 'weblate' into 'master'
weblate

See merge request fdroid/fdroidserver!1564
2024-11-20 16:42:27 +00:00
Phantomwise
fb880ad14f Translated using Weblate: French (fr) by Phantomwise <phantomwise67@protonmail.com>
Currently translated at 94.4% (559 of 592 strings)

Co-authored-by: Phantomwise <phantomwise67@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/
Translation: F-Droid/F-Droid Server
2024-11-20 17:31:53 +01:00
Hugo Carvalho
82e47bd392 Translated using Weblate: Portuguese (Portugal) (pt_PT) by Hugo Carvalho <hugokarvalho@hotmail.com>
Currently translated at 100.0% (592 of 592 strings)

Co-authored-by: Hugo Carvalho <hugokarvalho@hotmail.com>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_PT/
Translation: F-Droid/F-Droid Server
2024-11-20 17:31:53 +01:00
linsui
a72be3e415 Translated using Weblate: Chinese (Simplified Han script) (zh_Hans) by linsui <linsui@inbox.lv>
Currently translated at 100.0% (592 of 592 strings)

Translated using Weblate: Chinese (Simplified Han script) (zh_Hans) by linsui <linsui@inbox.lv>

Currently translated at 100.0% (592 of 592 strings)

Co-authored-by: linsui <linsui@inbox.lv>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/
Translation: F-Droid/F-Droid Server
2024-11-20 17:31:53 +01:00