kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00
Code Activity
7,929 Commits 1 Branch 59 Tags 43 MiB
84b45abb03
Commit Graph

7929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
dbe21b2b94 metadata: transform all TYPE_STRING values w/ _normalize_type_string() 
Before this, there were separate post-parse paths for app-fields versus
build-flags.  This makes all TYPE_STRING values always go through the same
post-parse code path.
 2023-04-28 10:44:19 +02:00
Hans-Christoph Steiner
a8531a03a6 metadata: refactor into one function to do YAML post processing 
It used to be that there had to be separate post processing steps depending
on whether it was parsing .txt or .yml.  The .txt format is long gone!

!772
 2023-04-28 10:44:19 +02:00
Hans-Christoph Steiner
3869e1374b metadata: force TYPE_STRING fields to string in internal dict 
* YAML 1.2's boolean is 'true' so this makes the conversion correct.
* rewritemeta would also have to be changed to support this.
 2023-04-27 21:51:10 +02:00
Hans-Christoph Steiner
c0ae09e0df metadata: remove strange app arg construct from parse_yaml_metadata() 
My guess is that this is some kind of vestige of the old code structure,
back when there was .txt and .yml formats.  This makes it a normal Python
function: input as arg, return value is the result.
 2023-04-27 21:51:10 +02:00
Hans-Christoph Steiner
41972e6525 warn on all unrecognized build flags 
No need to put the list of keys in a set beforehand, just report all build
flags that are invalid.
 2023-04-27 21:51:10 +02:00
Hans-Christoph Steiner
1166258145 map out type conversions in metadata.PostMetadataParseTest suite 2023-04-27 21:50:49 +02:00
Hans-Christoph Steiner
27a0df9ddb metadata: failfast=False like the rest of the tests 2023-04-27 21:48:27 +02:00
Michael Pöhn
2293633380 Merge branch 'enable-more-black' into 'master' 
enable more black code format

See merge request fdroid/fdroidserver!1349
 2023-04-27 09:50:59 +00:00
Hans-Christoph Steiner
6dcdadd0e3
config black exceptions in pyproject.toml 
This means that anyone can run `black .` and it won't break things. Plus it
gives us a roadmap for fully enabling black.
 2023-04-27 11:34:19 +02:00
Hans-Christoph Steiner
32ea4ef19a
enable black on fdroidserver/asynchronousfilereader/__init__.py 2023-04-27 11:34:18 +02:00
Hans-Christoph Steiner
2273d8203b
enable black on fdroidserver/signatures.py 2023-04-27 11:34:16 +02:00
Hans-Christoph Steiner
6620bf0208
enable black on tests: api, gpgsign, main, net, vcs 2023-04-27 11:34:14 +02:00
Hans-Christoph Steiner
77f9ac9fa8
enable black on fdroidserver/rewritemeta.py 2023-04-27 11:34:12 +02:00
Hans-Christoph Steiner
eb81af57bb
enable black on fdroidserver/init.py 2023-04-27 11:34:10 +02:00
Hans-Christoph Steiner
c7070b2799
index.TestCase: manually convert to black code format 
* switch to `from fdroidserver import common, index, signindex...`
 2023-04-27 11:34:07 +02:00
Hans-Christoph Steiner
98decf8cfa index: use 'fake.url' as test domain when no networking is used 2023-04-27 10:35:09 +02:00
Michael Pöhn
5e75b03814 Merge branch 'mirror-metadata' into 'master' 
index-v2 'mirrors' fully settable from config

See merge request fdroid/fdroidserver!1344
 2023-04-27 08:06:13 +00:00
Hans-Christoph Steiner
7c692a4532 index-v2 'mirrors' fully settable from config 
This lets mirrors: in config.yml be the same list-of-dicts format as it is
in index-v2.  This also includes a data format conversion to maintain the
right format for the old, unchanging index v0 and v1 formats.

#928
#1107
 2023-04-27 07:53:02 +00:00
Hans-Christoph Steiner
ceef07d2f2 test of current internal format of mirrors list in config 2023-04-27 07:53:02 +00:00
Hans-Christoph Steiner
c4d202f2d8 Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v8.1.1

See merge request fdroid/fdroidserver!1348
 2023-04-24 09:35:05 +00:00
fdroid-bot
087fd04b02 gradle v8.1.1 2023-04-24 09:21:53 +00:00
Hans-Christoph Steiner
60e11cab6c Merge branch 'remove-last-maven-quirks' into 'master' 
remove last `maven:` quirks and make it always a string

See merge request fdroid/fdroidserver!1345
 2023-04-24 09:21:11 +00:00
Hans-Christoph Steiner
ad960c6ecd
remove last maven: quirks and make it always a string 
It turns out that the maven: field was originally declared as a TYPE_STRING,
given that it was not given a different type in metadata.py's 	flagtypes.
The code was confused because it was given a default value of `False` rather
than `None` as the rest of the TYPE_STRING fields have.

This construct in build.py means maven: should always be a string:

        if '@' in build.maven:
            maven_dir = os.path.join(root_dir, build.maven.split('@', 1)[1])
        else:
            maven_dir = root_dir
 2023-04-24 11:08:48 +02:00
Hans-Christoph Steiner
a107e810d4
build: add test case for maven: builds 2023-04-24 11:08:46 +02:00
Hans-Christoph Steiner
7641c30389
add real test of moving files with deploy.update_serverwebroot() 2023-04-24 11:08:42 +02:00
Hans-Christoph Steiner
fa95302580
add myself to .mailmap !1347 2023-04-21 08:01:44 +02:00
Hans-Christoph Steiner
f09c806c96 Merge branch 'mailmap' into 'master' 
Add .mailmap

See merge request fdroid/fdroidserver!1347
 2023-04-21 05:56:28 +00:00
Gregor Düster
a2868766db
Add .mailmap 
See https://git-scm.com/docs/gitmailmap .
 2023-04-21 07:21:45 +02:00
Hans-Christoph Steiner
331d3663db Merge branch 'metadata_purge_legacy' into 'master' 
metadata: Remove code ensuring YAML 1.2 compatibility

See merge request fdroid/fdroidserver!1328
 2023-04-20 07:59:20 +00:00
Gregor Düster
d971f19e92
metadata: Remove code ensuring YAML 1.2 compatibility 
This is no longer necessary b/c the current YAML parser, ruamel.yaml,
implements YAML 1.2 in contrast to the previous parser PyYAML.
 2023-04-18 17:08:44 +02:00
Gregor Düster
cff57e1a53
metadata: Remove ununsed code 2023-04-18 17:08:43 +02:00
Michael Pöhn
82c3e364a5 Merge branch 'fix-ci-for-sdkmanager' into 'master' 
gitlab-ci: ubuntu_lts_ppa & debian_testing jobs need sdkmanager

See merge request fdroid/fdroidserver!1339
 2023-04-13 13:32:15 +00:00
Hans-Christoph Steiner
3b0a6575de gitlab-ci: ubuntu_lts_ppa & debian_testing jobs need sdkmanager 2023-04-13 12:32:47 +00:00
Hans-Christoph Steiner
894a421d43 Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v8.1

See merge request fdroid/fdroidserver!1341
 2023-04-12 14:06:19 +00:00
fdroid-bot
c107d93568 gradle v8.1 2023-04-12 12:45:24 +00:00
Hans-Christoph Steiner
5e3624157c Merge branch 'sonatype' into 'master' 
Add maven central staging repo to allowed list

See merge request fdroid/fdroidserver!1340
 2023-04-12 12:44:43 +00:00
Jason Donenfeld
6a239cbde4 Add maven central staging repo to allowed list 2023-04-12 12:44:42 +00:00
Hans-Christoph Steiner
135fb76b6d Merge branch 'update_status' into 'master' 
Write status json upon fdroid update start (Closes: #1114)

Closes #1114

See merge request fdroid/fdroidserver!1338
 2023-04-11 16:45:45 +00:00
Jochen Sprickerhof
f5cdeff507
Write status json upon fdroid update start (Closes: #1114) 2023-04-11 17:14:58 +02:00
Hans-Christoph Steiner
ab3f64c22f Merge branch 'fix-apt-syntax' into 'master' 
buildserver: fix apt Acquire::Retries syntax

See merge request fdroid/fdroidserver!1337
 2023-04-11 14:45:45 +00:00
Hans-Christoph Steiner
48be7c3b25
buildserver: fix apt Acquire::Retries syntax 
Acquire is its own group, not a subgroup of APT:
https://manpages.debian.org/buster/apt/apt.conf.5.en.html#THE_ACQUIRE_GROUP
 2023-04-11 16:33:14 +02:00
Hans-Christoph Steiner
f5d5d9e9b8 Merge branch 'remove-download-handling' into 'master' 
remove NDK download handling in favor of fdroid/sdkmanager

See merge request fdroid/fdroidserver!1070
 2023-04-11 11:55:18 +00:00
Hans-Christoph Steiner
36d2a8f899
all ndk paths in config must be strings 
The paths in the config must be strings because they are used in things
like env vars where they must be strings.  Plus lots of other places in the
code assumes they are strings.  This is the first step to defining the
border of where paths can be pathlib.Path() and where they must be strings.
 2023-04-11 13:54:19 +02:00
Hans-Christoph Steiner
898624dcac
common.get_android_tools_versions() for modern NDK dir layout 
NDK r10e is still in use, but is so old, it does not have the modern
sdkmanager package metadata.
 2023-04-11 13:54:17 +02:00
Hans-Christoph Steiner
0dd5a7db64
remove NDK download handling in favor of fdroid/sdkmanager 2023-04-11 13:54:05 +02:00
Hans-Christoph Steiner
66d750e5fa Merge branch 'fix_ipfs_test' into 'master' 
Strip ipfsCIDv1 before testing index-v2

See merge request fdroid/fdroidserver!1335
 2023-04-11 10:29:57 +00:00
Jochen Sprickerhof
d59a88f844 Strip ipfsCIDv1 before testing index-v2 2023-04-11 10:29:27 +00:00
Hans-Christoph Steiner
239ab5bd21 Merge branch 'test_find_sdk_tools_cmd-intermittent' into 'master' 
set skipUnless for test that relies on ANDROID_HOME

See merge request fdroid/fdroidserver!1334
 2023-04-11 09:05:18 +00:00
Hans-Christoph Steiner
94badac317 set skipUnless for test that relies on ANDROID_HOME 
This job just started failing, but wasn't before:
https://gitlab.com/eighthave/fdroidserver/-/jobs/4060582594

But I look at it, and it looks right that it fails.  So how on earth
was it succeeding before?  Basically the `os.getenv('ANDROID_HOME')`
returns `None` when `ANDROID_HOME` is not set. It is not set in both the
jobs, so how did it not stacktrace before?
 2023-04-04 22:41:46 +02:00
Hans-Christoph Steiner
7c85afc988 Merge branch 'fix_antifeatures' into 'master' 
Fix antifeatures

See merge request fdroid/fdroidserver!1331
 2023-04-04 14:21:10 +00:00