1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-05 06:50:10 +01:00
Commit Graph

5243 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
e8bad73ae4 Merge branch 'master' into 'master'
modernize PEP8 checks to prepare for Python 3.7

See merge request fdroid/fdroidserver!512
2018-05-29 12:14:15 +00:00
Hans-Christoph Steiner
ff90c0246e fix PEP8 W605 invalid escape sequence
Python 3.7 will get a lot stricter with escape sequences.  They must be
valid.

* https://lintlyci.github.io/Flake8Rules/rules/W605.html
* https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
2018-05-29 13:51:47 +02:00
Hans-Christoph Steiner
e6d5260c3c fix PEP8: W504 line break after binary operator 2018-05-29 12:31:56 +02:00
Hans-Christoph Steiner
8c4f75e05f pre-commit hook: use most compatible grep flags
The minimal test suite runs on Alpine use busybox grep, and BSD grep also
often has different flags.
2018-05-29 11:28:08 +02:00
Hans-Christoph Steiner
a87df29135 gitlab-ci: pep8 has been replaced by pycodestyle 2018-05-29 11:28:08 +02:00
Marcus
4b3b14ca82 Merge branch 'cleanup-platform27' into 'master'
remove platform-27_r01

See merge request fdroid/fdroidserver!511
2018-05-28 14:17:48 +00:00
Marcus Hoffmann
e0f54ff995
remove platform-27_r01
Superseded by r03.
2018-05-28 16:04:38 +02:00
Hans-Christoph Steiner
e180e03a5a tests: fix index-v1.json unicode test 2018-05-28 09:29:11 +02:00
Hans-Christoph Steiner
c37c8bc0a5 bump to 1.0.6 2018-05-25 17:29:14 +02:00
Hans-Christoph Steiner
91068d8e00 tests: rename unicode test file to fix "file name too long" errors
pristine-tar and mkdir barf on this file.
2018-05-25 17:27:58 +02:00
Hans-Christoph Steiner
e986dcf985 directly use README.md for pypi, using new metadata options
* https://packaging.python.org/tutorials/packaging-projects/#description
* https://packaging.python.org/specifications/core-metadata/#description-content-type-optional
* https://blog.thea.codes/github-flavored-markdown-on-pypi/
2018-05-25 14:23:05 +02:00
Hans-Christoph Steiner
dae73be4ab bump to 1.0.5 2018-05-25 13:53:09 +02:00
Hans-Christoph Steiner
6c64b68c7e Merge branch 'weblate' into 'master'
Weblate

See merge request fdroid/fdroidserver!510
2018-05-25 11:36:15 +00:00
Hans-Christoph Steiner
19d59ae655 Weblate 2018-05-25 11:36:15 +00:00
Torsten Grote
8231042699 Merge branch 'polish-verification.f-droid.org-setup' into 'master'
Polish verification.f droid.org setup

See merge request fdroid/fdroidserver!509
2018-05-25 10:59:32 +00:00
Hans-Christoph Steiner
fb02073cab fix "local variable 'e' is assigned to but never used" 2018-05-25 12:32:34 +02:00
Hans-Christoph Steiner
14127bf418 gitlab-ci: combine all lint/syntax/safety checks into a single job
This should make it easier to accept merge requests where there are only
cosmetic problems with them.  pep8/pylint/pyflakes runs can then be disabled
in the 'test' job by not installing the in the ci-images-server base image.
2018-05-25 12:12:40 +02:00
Hans-Christoph Steiner
5ff1b5ef37 verify: exit with error code if any APK fails to verify 2018-05-25 11:56:13 +02:00
Hans-Christoph Steiner
a3a0b8dcf0 verify: --reuse-remote-apk to reuse local APKs
For something like a verification server, this avoids having `fdroid verify`
redownload the remote APK from f-droid.org every time its run.  For normal
users, it should download a fresh copy each time to avoid false errors
based on confusion over anything that might have changed the local copy of
the remote APK.

This patch has been used on verification.f-droid.org for a while now. It is
the last thing keeping verification.f-droid.org from using fdroidserver
straight from stretch-backports.
2018-05-25 11:48:01 +02:00
Hans-Christoph Steiner
b0a5ec5c1a workaround crash in diffoscope when verifying APKs
On versions of diffoscope before 87, like the version included in Ubuntu
xenial LTS, it would crash saying:

ValueError: max_diff_block_lines (100) cannot be smaller than max_page_diff_block_lines (128)

https://bugs.debian.org/875451
2018-05-25 11:48:01 +02:00
Hans-Christoph Steiner
5afba57212 Merge branch 'fix-tests' into 'master'
Fix tests and polish release

See merge request fdroid/fdroidserver!508
2018-05-25 08:51:18 +00:00
Hans-Christoph Steiner
0a15a9b65b tests: fix and test fdroid deploy 2018-05-25 10:32:09 +02:00
Hans-Christoph Steiner
1daa1063c5 tests: keep strerr totally clean on successful runs
Debian's autopkgtest defaults to considering any output on stderr as a sign
that the tests failed.  it is simple to make this achieve that standard, so
it seems worth it for now at least.
2018-05-25 10:32:01 +02:00
Hans-Christoph Steiner
002a4ae50e fix including unicode test APK in source tarball 2018-05-25 10:32:01 +02:00
Hans-Christoph Steiner
cef73e5794 remove unused variable, as reported by pyflakes 2018-05-25 10:32:01 +02:00
Hans-Christoph Steiner
74fb07b302 gitlab-ci: switch pyup_io_safety_check to Alpine to be lighter 2018-05-25 09:54:08 +02:00
Hans-Christoph Steiner
00971941fd Merge branch 'reproducible-bug' into 'master'
Fix reproducible builds

See merge request fdroid/fdroidserver!505
2018-05-24 19:32:46 +00:00
Torsten Grote
c6f3aed003
Fix reproducible builds
This commit fixes two bugs with reproducible builds:
* Files added by the buildserver to META-INF (fdroidserverid and buildserverid)
  were causing signature verification to always fail when --on-server was used.
  Since they are not needed anymore, they are no longer added to APKs.
* When showing a diff between both APK files, `jar xf` did not extract
  the full APK properly which was causing useless diffs.
  Instead of using jar, python's zipfile library is used instead.
2018-05-24 16:09:10 -03:00
Marcus
d9417093f3 Merge branch 'platform-27_r3' into 'master'
makebuildserver: add platform-27_r03

See merge request fdroid/fdroidserver!507
2018-05-23 22:44:34 +00:00
Marcus Hoffmann
23ccbf2965
makebuildserver: add platform-27_r03 2018-05-24 00:27:40 +02:00
Hans-Christoph Steiner
bd6de3d755 Merge branch '492-Stop-using-eval' into 'master'
Resolve "Stop using `eval()`"

Closes #492

See merge request fdroid/fdroidserver!506
2018-05-22 14:21:43 +00:00
Michael Pöhn
6b1f242d25 added tests for common.calculate_math_string 2018-05-22 13:24:37 +02:00
Michael Pöhn
24b20d7668 use simple ast+operator based calculator for evaluating Vercode Operation 2018-05-22 13:08:14 +02:00
Marcus
79a022400f Merge branch 'patch-1' into 'master'
fixed typo vmtools.py

See merge request fdroid/fdroidserver!504
2018-05-21 15:53:54 +00:00
Michael Pöhn
f8a7c23485 fixed typo vmtools.py 2018-05-21 15:29:13 +00:00
Marcus
47cfeff87a Merge branch 'ndk17' into 'master'
makebuildserver: add ndk17

See merge request fdroid/fdroidserver!502
2018-05-17 21:10:14 +00:00
Marcus Hoffmann
c964dd49c8
makebuildserver: add ndk17 2018-05-17 22:37:06 +02:00
Marcus
280ddfb9e8 Merge branch 'spdx-4.0' into 'master'
Spdx 4.0

See merge request fdroid/fdroidserver!501
2018-05-16 21:13:41 +00:00
Marcus Hoffmann
a4b6549927
tests: adapt to spdx v4.0.0 2018-05-16 22:49:57 +02:00
Marcus Hoffmann
f4bb76f3a4
lint: update spdx tags to v4.0.0 2018-05-16 22:36:39 +02:00
Hans-Christoph Steiner
3cb4aa6c18 bump to 1.0.4 2018-05-15 12:39:18 +02:00
Hans-Christoph Steiner
f6bcf5cfe2 Merge branch 'weblate' into 'master'
Weblate

See merge request fdroid/fdroidserver!500
2018-05-15 10:31:31 +00:00
Hans-Christoph Steiner
d8d1d7774e Weblate 2018-05-15 10:31:31 +00:00
Hans-Christoph Steiner
a76c5cc0b3 Merge branch 'release-test-overhaul' into 'master'
release test overhaul

See merge request fdroid/fdroidserver!499
2018-05-15 09:59:11 +00:00
Hans-Christoph Steiner
f0795cc092 tests: git repo mirror tests require git >= 2.3 2018-05-14 15:25:33 +02:00
Hans-Christoph Steiner
6570e85a2b gitlab-ci: new test case of pip installs on Ubuntu/trusty
Ubuntu/trusty is used as the base image for CI systems like Travis, as well
as Microsoft Subsystem for Linux.  SO we need to provide working options.
2018-05-14 15:25:33 +02:00
Hans-Christoph Steiner
2d3e7ef950 tests: allow tests to run without any Android SDK installed 2018-05-14 15:25:33 +02:00
Hans-Christoph Steiner
43c61aecee fix pylint Unused argument 2018-05-14 15:25:33 +02:00
Hans-Christoph Steiner
6db9ba8334 androguard >= 3.1.0 is in pypi, so add it to install_requires 2018-05-14 15:25:33 +02:00
Hans-Christoph Steiner
54b21a6d22 move pylint run to standalone gitlab-ci job 2018-05-14 15:25:33 +02:00