Hans-Christoph Steiner
cff3364fdf
split out mirrors data structure into standalone, tested function
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner
9749282b44
net: fix test_download_file_url_parsing
...
self.assertTrue(requests_get.called) will always be true because .called
will contain a MagicMock instance.
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner
7904f12d05
net: add test of automatic retries in download_file()
...
The existing logic from d1ddd525c
in !1225 is confusing because it adds its
own retry loop on top of the retry mechanism that is built into requests.
So this test confirms that setting `download_file(retries=3)` actually
results in more than three retries.
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner
074dda4b61
use tiny entry.jar rather than large index-v1.jar for net test case
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner
261be20109
convert tests/testcommon.py to black code format
2024-03-06 13:31:46 +00:00
Hans-Christoph Steiner
617a9e75c7
convert install.py to black code format
2024-03-06 13:31:46 +00:00
Michael Pöhn
9dc14674f1
Merge branch 'nice-console-output' into 'master'
...
method to globally set logging to output nicely to the console
See merge request fdroid/fdroidserver!1449
2024-03-06 13:03:18 +00:00
Hans-Christoph Steiner
76d9eddb3a
method to globally set logging to output nicely to the console
...
This will make all of the direct calls to logging level functions output
in a format that looks appropriate for the console. Previously, the default
output looked like it should be written to a log file.
2024-03-06 12:53:20 +00:00
Hans-Christoph Steiner
091fe9b260
Merge branch 'litecoin' into 'master'
...
fix litecoin address regex
See merge request fdroid/fdroidserver!1441
2024-02-28 08:01:03 +00:00
linsui
7913df25ba
fix litecoin address regex
2024-02-28 08:00:39 +00:00
Hans-Christoph Steiner
c5d4b5b991
Merge branch 'nonfreenet-non-changeable' into 'master'
...
add 'non-changeable' to NonFreeNet description
See merge request fdroid/fdroidserver!1448
2024-02-21 17:31:58 +00:00
Nitai Sasson
8931e038d6
add 'non-changeable' to NonFreeNet description
2024-02-21 17:13:58 +01:00
Hans-Christoph Steiner
ba59241422
Merge branch 'refresh-scanner-in-buildserver-vm' into 'master'
...
build: pass --refresh-scanner thru to buildserver VM
See merge request fdroid/fdroidserver!1447
2024-02-16 15:36:34 +00:00
Hans-Christoph Steiner
04cedd1808
build: pass --refresh-scanner thru to buildserver VM
2024-02-16 11:43:42 +01:00
Hans-Christoph Steiner
35c373a473
Merge branch 'gradle-release-checksums.py' into 'master'
...
update to gradle v7.6.4
See merge request fdroid/fdroidserver!1445
2024-02-14 17:41:46 +00:00
fdroid-bot
ec88cc627f
gradle v8.6
2024-02-14 17:32:15 +00:00
Hans-Christoph Steiner
3c77ac66b1
gitlab-ci: revert to old config.py for servergitmirrors: job
2024-02-14 18:31:25 +01:00
Hans-Christoph Steiner
c794c0fe18
Merge branch 'fixup-1438' into 'master'
...
fixups from "feat: add servergitmirrors as a dict support"
See merge request fdroid/fdroidserver!1446
2024-02-14 17:12:17 +00:00
Hans-Christoph Steiner
4e0c721b04
fixups from "feat: add servergitmirrors as a dict support"
...
These slipped by in reviewing fdroidserver!1438
https://gitlab.com/fdroid/fdroidserver/-/jobs/6173435409
2024-02-14 18:10:29 +01:00
Hans-Christoph Steiner
094764398a
Merge branch 'servergitmirrors-as-dict' into 'master'
...
feat: add servergitmirrors as a dict support
See merge request fdroid/fdroidserver!1438
2024-02-14 16:50:40 +00:00
proletarius101
947217549a
feat: add servergitmirrors as a dict support
2024-02-14 16:50:39 +00:00
Hans-Christoph Steiner
12692b76b7
Merge branch 'safety-ignore-windows-only-CVE-2024-22190' into 'master'
...
safety: ignore CVE-2024-22190 it only affects Windows
See merge request fdroid/fdroidserver!1444
2024-02-14 16:49:50 +00:00
Hans-Christoph Steiner
b36153b06c
safety: ignore CVE-2024-22190 it only affects Windows
...
https://security-tracker.debian.org/tracker/CVE-2024-22190
2024-02-14 17:46:12 +01:00
Hans-Christoph Steiner
7462ed7283
Merge branch 'gradle' into 'master'
...
add gradle 8.6
See merge request fdroid/fdroidserver!1440
2024-02-05 13:23:45 +00:00
linsui
ac71bb07b8
add gradle 8.6
2024-02-05 13:23:13 +00:00
Hans-Christoph Steiner
ee764ff92e
Merge branch 'scanner' into 'master'
...
scanner: refresh data without scanning
See merge request fdroid/fdroidserver!1437
2024-01-29 15:26:28 +00:00
linsui
2f313a0bd6
scanner: refresh data without scaning
2024-01-29 23:13:13 +08:00
Michael Pöhn
1c203ae643
Merge branch 'refresh_scanner-config' into 'master'
...
scanner: add refresh_config config item for buildserver
Closes #1184
See merge request fdroid/fdroidserver!1435
2024-01-25 22:40:23 +00:00
Hans-Christoph Steiner
031a130395
scanner: add refresh_config config item for buildserver
...
Includes some cosmetic changes from black.
2024-01-25 17:04:38 +01:00
Hans-Christoph Steiner
907dfd1c3c
Merge branch 'suss-refresh' into 'master'
...
scanner: use the refreshed data
Closes #1184
See merge request fdroid/fdroidserver!1434
2024-01-25 13:11:21 +00:00
Hans-Christoph Steiner
d6aa3caaca
scanner: test of --refresh controls triggering a refresh
2024-01-25 14:03:46 +01:00
linsui
6fb2e07dda
fdroid build: add --refresh-scanner option
...
Apply 1 suggestion(s) to 1 file(s)
2024-01-25 14:03:12 +01:00
linsui
fe7e4f8226
scanner: refresh data before loading data
2024-01-25 14:03:12 +01:00
Hans-Christoph Steiner
aa0b85955c
Merge branch 'version' into 'master'
...
Fix "fdroid --version"
Closes #1164
See merge request fdroid/fdroidserver!1433
2024-01-25 12:00:30 +00:00
Gregor Düster
b9c7e8f63a
Fix "fdroid --version"
...
Fixes https://gitlab.com/fdroid/fdroidserver/-/issues/1164 .
Helpful resource:
https://packaging.python.org/en/latest/guides/single-sourcing-package-version/
2024-01-25 12:00:05 +00:00
Hans-Christoph Steiner
7ade08e46d
Merge branch 'updatesuss' into 'master'
...
Update default suss
See merge request fdroid/fdroidserver!1431
2024-01-25 11:40:32 +00:00
Hans-Christoph Steiner
1d9ec42758
scanner: update test counts based on new default rules
...
The new rules announce more things.
2024-01-25 12:31:05 +01:00
Hans-Christoph Steiner
681392d8c2
scanner: script to update default rules from SUSS
2024-01-25 11:51:22 +01:00
Licaon_Kter
ac6a08e10f
Update default suss
2024-01-25 11:05:55 +01:00
Michael Pöhn
d60f36c30e
Merge branch 'serverwebroot-as-dict' into 'master'
...
config: convert serverwebroot: to list-of-dicts format
See merge request fdroid/fdroidserver!1430
2024-01-24 10:46:04 +00:00
Hans-Christoph Steiner
810387a009
deploy: update_serverwebroots() for testable logic
...
This moves all of the serverwebroot: logic into a function, and adds tests.
I did this because I ran into issues in the logic in main():
Traceback (most recent call last):
File "/builds/eighthave/fdroidserver/fdroid", line 22, in <module>
fdroidserver.__main__.main()
File "/builds/eighthave/fdroidserver/fdroidserver/__main__.py", line 230, in main
raise e
File "/builds/eighthave/fdroidserver/fdroidserver/__main__.py", line 211, in main
mod.main()
File "/builds/eighthave/fdroidserver/fdroidserver/deploy.py", line 753, in main
s = serverwebroot.rstrip('/').split(':')
AttributeError: 'dict' object has no attribute 'rstrip'
2024-01-23 18:49:12 +01:00
Hans-Christoph Steiner
fbf097d390
deploy: update_serverwebroot() works w/o options/config
...
Since update_serverwebroot() is part of the public API, this function should
work without setting `fdroidserver.deploy.options` or
`fdroidserver.deploy.config`.
2024-01-23 17:48:47 +01:00
Hans-Christoph Steiner
7a656d45e3
config: convert serverwebroot: to list-of-dicts format
...
This allows for more metadata about the server and deploy mode.
2024-01-22 22:11:49 +01:00
Hans-Christoph Steiner
3f50372d8d
config: test cases for serverwebroot: with string and list
2024-01-22 22:11:49 +01:00
Michael Pöhn
5983962107
Merge branch 'biplist' into 'master'
...
gitlab-ci: install biplist if available, otherwise skip test_parse_ipa
See merge request fdroid/fdroidserver!1429
2024-01-11 16:21:32 +00:00
Hans-Christoph Steiner
dc7170e709
gitlab-ci: install biplist if available, otherwise skip test_parse_ipa
...
Fedora does not have a biplist package.
2024-01-11 16:02:06 +01:00
Hans-Christoph Steiner
6eee83db47
run black on new .ipa test cases
2024-01-11 16:02:06 +01:00
Hans-Christoph Steiner
22d3ba81dd
Merge branch 'ipa-support' into 'master'
...
minimal IPA support
Closes #1067
See merge request fdroid/fdroidserver!1413
2024-01-11 11:13:48 +00:00
Michael Pöhn
8b5a61bb25
⛰️ make ipa related test cases more robust
2024-01-11 12:02:53 +01:00
Michael Pöhn
881943a0db
🥔 install biplist for ci tests
...
biplist is an optional python dependency required for processing iOS
apps. (.ipa files)
2024-01-11 12:02:52 +01:00