kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity
8,019 Commits 1 Branch 59 Tags 40 MiB
64b8ee772c
Commit Graph

8019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
64b8ee772c throw useful error if a config YAML file is not a dict 2023-09-08 10:42:27 +02:00
Hans-Christoph Steiner
00aa595f37 deploy: give useful error if rsync is not installed 2023-09-08 10:42:27 +02:00
Hans-Christoph Steiner
ed50de055a
Merge branch 'gradlew-fdroid-8.2' into 'master' 
gradlew-fdroid: add key/values for Gradle Android Plugin 8.3, 8.2 and 8.1

See merge request fdroid/fdroidserver!1386
 2023-09-08 08:35:29 +00:00
Hans-Christoph Steiner
207859f160 gradlew-fdroid: add key/values for Gradle Android Plugin 8.3/8.2/8.1 2023-09-08 08:35:21 +00:00
Hans-Christoph Steiner
38c0463bd0
Merge branch 'indent' into 'master' 
metadata: set mapping indentation to 2

Closes #1154

See merge request fdroid/fdroidserver!1385
 2023-09-08 08:26:38 +00:00
linsui
8188bb6bfa metadata: set mapping indentation to 2 2023-09-08 08:18:27 +00:00
Jochen Sprickerhof
c3331b1c58 Merge branch 'gradlew-8.3' into 'master' 
Gradle 8.3

See merge request fdroid/fdroidserver!1388
 2023-08-21 12:26:40 +00:00
cvzi
f0aa3bae66
Gradle 8.3 2023-08-19 00:17:21 +02:00
Michael Pöhn
8bba38f5dc Merge branch 'config-files-error' into 'master' 
log error if config file name is not known; standardize Release Channels config filename

See merge request fdroid/fdroidserver!1369
 2023-07-25 14:39:34 +00:00
Hans-Christoph Steiner
9df8caca07 log error if config file name is not known 
The case of Anti-Features keys and filenames is quite confusing.  I was
confused to find out that config/antiFeatures.yml is correct, while
config/antifeatures.yml is nothing.  This throws an error message to make
that clear.
 2023-07-25 14:31:09 +00:00
Hans-Christoph Steiner
4e28fad55a use constants for names used in the config dict 
Hopefully this helps with the Anti-Features case confusion:
* antifeatures
* antiFeatures
* AntiFeatures
 2023-07-25 14:31:09 +00:00
Hans-Christoph Steiner
190a95ab17 use consistent name for releaseChannels config file 2023-07-25 14:31:09 +00:00
Jochen Sprickerhof
04aa9d2a06 Merge branch 'mirror-rsync-timeout' into 'master' 
mirror-to-mirror.sh: set 1h timeout for rsync runs

See merge request fdroid/fdroidserver!1381
 2023-07-25 13:03:41 +00:00
Hans-Christoph Steiner
ce77a33228
mirror-to-mirror.sh: set 1h timeout for rsync runs 
This script is run every 10 minutes or so to push new files to the primary
mirrors.  It sets a lock to prevent multiple copies from running in
parallel.  Yesterday, one rsync process got stuck and never exited, thereby
preventing this script from running.  Adding a 1h timeout seems like a safe
way to deal with this kind of problem.  This would not deal with rsync
getting so stuck that it fails to heed the timeout, hopefully that's not an
issue.
 2023-07-25 14:52:29 +02:00
Hans-Christoph Steiner
c88eb253f6 Merge branch 'importtemplate' into 'master' 
Import - add more template content

See merge request fdroid/fdroidserver!1378
 2023-07-12 13:45:10 +00:00
Licaon_Kter
a756ce0b1a Import - add more template content 2023-07-12 13:45:10 +00:00
Hans-Christoph Steiner
15adec73ca Merge branch 'licaon-kter-master-patch-54084' into 'master' 
Gradle 8.2.1

See merge request fdroid/fdroidserver!1380
 2023-07-12 13:33:52 +00:00
Licaon_Kter
d040fc518a Gradle 8.2.1 2023-07-12 13:33:46 +00:00
Hans-Christoph Steiner
85d87aea14 Merge branch 'alex2-master-patch-82183' into 'master' 
Don't specify a release candidate in version constraint for androguard dependency

See merge request fdroid/fdroidserver!1379
 2023-07-10 10:19:59 +00:00
Alex Gaynor
5660e7089d Don't specify a release candidate in version constraint for androguard dependency 
This causes pip to include pre-releases for all dependencies, which is unfortunate in many cases.
 2023-07-08 16:24:00 +00:00
Hans-Christoph Steiner
e1a108fd71 Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v8.2

See merge request fdroid/fdroidserver!1377
 2023-07-04 08:27:43 +00:00
fdroid-bot
fda149821a gradle v8.2 2023-07-04 08:19:00 +00:00
Hans-Christoph Steiner
3f02072f20 Merge branch 'licaon-kter-master-patch-84619' into 'master' 
Gradle 8.2

See merge request fdroid/fdroidserver!1375
 2023-07-04 08:18:33 +00:00
Licaon_Kter
f9d9abf98d Gradle 8.2 2023-07-04 08:18:21 +00:00
Hans-Christoph Steiner
61925ac4f4 Merge branch 'fix-ci' into 'master' 
two small fixes for failing GitLab CI jobs

See merge request fdroid/fdroidserver!1376
 2023-07-04 08:18:05 +00:00
Hans-Christoph Steiner
132e953c8c update: use proper name for PIL image filter ANTIALIAS -> LANCZOS 
ANTIALIAS was made an alias of LANCZOS in 2.7.0:
https://pillow.readthedocs.io/en/stable/releasenotes/2.7.0.html#antialias-renamed-to-lanczos

The ANTIALIAS alias was removed in Pillow 10.0.0:
https://pillow.readthedocs.io/en/stable/deprecations.html
 2023-07-03 17:44:47 +02:00
Hans-Christoph Steiner
3db90b65fb gitlab-ci: switch archlinux job to virtualenv 
https://gitlab.com/fdroid/fdroidserver/-/jobs/4466370098

$ pip install -e .[test]
error: externally-managed-environment
× This environment is externally managed
╰─> To install Python packages system-wide, try 'pacman -S
    python-xyz', where xyz is the package you are trying to
    install.

    If you wish to install a non-Arch-packaged Python package,
    create a virtual environment using 'python -m venv path/to/venv'.
    Then use path/to/venv/bin/python and path/to/venv/bin/pip.

    If you wish to install a non-Arch packaged Python application,
    it may be easiest to use 'pipx install xyz', which will manage a
    virtual environment for you. Make sure you have python-pipx
    installed via pacman.

note: If you believe this is a mistake, please contact your Python installation or OS distribution provider. You can override this, at the risk of breaking your Python installation or OS, by passing --break-system-packages.
 2023-07-03 16:17:08 +02:00
Hans-Christoph Steiner
255258f1c8 Merge branch 'lint-categories-from-config' into 'master' 
Lint: categories from config

See merge request fdroid/fdroidserver!1366
 2023-06-13 16:05:51 +00:00
Hans-Christoph Steiner
6b82710039 test load_localized_config() with categories 2023-06-02 13:28:53 +02:00
Hans-Christoph Steiner
bc58959315 purge remnants of repo/categories.txt, which is long unused 2023-06-02 13:26:03 +02:00
Hans-Christoph Steiner
1c3a87e002 lint: get Categories from config 2023-06-02 13:26:03 +02:00
Hans-Christoph Steiner
6124caf341 Merge branch 'test_for_1370' into 'master' 
Add test for !1370

See merge request fdroid/fdroidserver!1372
 2023-06-02 11:12:17 +00:00
Jochen Sprickerhof
7af95fc660
gitlab-ci: bump version to compare in metadata_v0 job 2023-06-02 10:38:16 +02:00
Jochen Sprickerhof
27ea667438
Add test for !1370 
The bug fixed in !1370 was due to a reuse of the per app anti features
dictionary in the per version one and adding the per version anti
features into it. This was not caught by the test suite as the app
versions are processed from newest to oldest and the test data had only
anti features in the oldest version. This patch adds an anti feature to
a newest version so only those in between should not have it.
 2023-06-02 10:26:27 +02:00
Hans-Christoph Steiner
a1c4f803de Merge branch 'fix-ArchivePolicy-0' into 'master' 
update: fix regression for ArchivePolicy: 0

See merge request fdroid/fdroidserver!1371
 2023-06-01 18:59:14 +00:00
Hans-Christoph Steiner
d96de4d8c2 update: test archive_old_apks() with ArchivePolicy: 0 2023-06-01 20:31:26 +02:00
FC Stegerman
9ac7dfe452 update: fix regression for ArchivePolicy: 0 
* https://gitlab.com/fdroid/fdroidserver/-/merge_requests/920#note_1413338920
* https://gitlab.com/fdroid/fdroidserver/-/merge_requests/920#note_1413344025
 2023-06-01 20:31:24 +02:00
Hans-Christoph Steiner
d564ba1fd1 Merge branch 'fix_antifeatures' into 'master' 
Don't modify app dict when generating v2 antifeatures

Closes #1103

See merge request fdroid/fdroidserver!1370
 2023-06-01 17:56:59 +00:00
Jochen Sprickerhof
2ee3cccb60 Don't modify app dict when generating v2 antifeatures 
Regression of: 061ca38a
Closes: #1103
 2023-06-01 17:53:34 +00:00
Hans-Christoph Steiner
3f7e01b909 Merge branch 'licaon-kter-master-patch-94098' into 'master' 
scanner - tgz is gzip

See merge request fdroid/fdroidserver!1368
 2023-06-01 11:40:20 +00:00
Licaon_Kter
2a60f6c195 scanner - tgz is gzip 2023-06-01 07:43:42 +00:00
Hans-Christoph Steiner
d929c15843 Merge branch 'archivepolicy-integer' into 'master' 
Make "ArchivePolicy" always be an integer

Closes #327

See merge request fdroid/fdroidserver!920
 2023-05-31 19:34:00 +00:00
Gregor Düster
31791b44f3
fixup! metadata: Make ArchivePolicy an interger internally 2023-05-30 23:05:59 +02:00
Hans-Christoph Steiner
9ef2088ace
add unit tests 2023-05-30 23:02:36 +02:00
Gregor Düster
337974cbed
metadata: Make ArchivePolicy an interger internally 2023-05-30 23:02:34 +02:00
Michael Pöhn
cf887583c0 Merge branch 'metadata-sort-and-refactor' into 'master' 
metadata: remove obsolete quirks; add sorting and removal of empty values

Closes #332

See merge request fdroid/fdroidserver!1365
 2023-05-29 16:50:57 +00:00
Hans-Christoph Steiner
fac7ceffe3 metadata: remove non-values from Builds: entries 2023-05-29 16:50:28 +00:00
Hans-Christoph Steiner
689786eea4 metadata: refactor _builds_to_yaml to use dicts and _format functions 
_builds_to_yaml does not use any features of the metadata.Build class, so
it can operate on plain dicts as well.  It also does not need to output
Build instances because those are converted to plain dicts when writing out
to YAML.
 2023-05-29 16:50:28 +00:00
Hans-Christoph Steiner
b055559df7 metadata: remove STRING/INT conversion on output 
The type conversion should all happen in post_parse_yaml_metadata whenever
possible.  Also, when `if` blocks end in `return`, it is clearer if no
`elif` or `else` is used.
 2023-05-29 16:50:28 +00:00
Hans-Christoph Steiner
1bc9b41a2b metadata: YAML 1.2 handles gradle: off now, "off" isn't a boolean 
Before switching to YAML 1.2, there needed to be special handling of values
that YAML parsed as booleans.
 2023-05-29 16:50:28 +00:00