Commit Graph
3635 Commits
Author SHA1 Message Date
Daniel Martí 4e28fa78fc Fix python headers in some source files
These were missing the python2 header, so they went under my radar when
doing the switch go python3.
2016-03-11 13:27:00 +00:00
Daniel Martí 24ad0418e3 tests: switch to python3 2016-03-11 13:27:00 +00:00
Daniel Martí a1703f1204 update: fix encoding issues with the xml index 2016-03-11 13:27:00 +00:00
Daniel Martí 24266d48e1 update: get output bytes, not str, from keytool 2016-03-11 13:27:00 +00:00
Daniel Martí 4cb5ff0247 common: Introduce FDroidPopenBytes
* We can now get the output bytes directly if desired
* FDroidPopen remains with str output
* Ouptut is now buffered efficiently with a BytesIO instead of
  concatenating strings
2016-03-11 13:27:00 +00:00
Daniel Martí 63f8718cf5 Replace iterkeys() with keys() 2016-03-10 16:43:37 +00:00
Daniel Martí 8b3c27cb47 update: replace encode('hex') with hexlify 2016-03-10 16:43:37 +00:00
Daniel Martí b31e20ee8b publish: fix hashing of strings 2016-03-10 16:43:37 +00:00
Daniel Martí a78341d8e5 init: fix writing into file 2016-03-10 16:43:37 +00:00
Daniel Martí da258dad57 Replace md5 with hashlib.md5 2016-03-10 16:43:37 +00:00
Daniel Martí dd8ad7a4fd common: fix str fetching from manifest xml 2016-03-10 16:43:37 +00:00
Daniel Martí d39bf37ce8 Port urllib and HTMLParser imports to python3 2016-03-10 16:43:37 +00:00
Daniel Martí fc21dbc667 Replace remaining file() usage 2016-03-10 16:43:37 +00:00
Daniel Martí 5026d4e08b FDroidPopen: return str again
In the future we might want to instead return bytes, but for now the
easiest for the port to python3 is to continue to return str.
2016-03-10 16:43:37 +00:00
Daniel Martí b73cc8e0b3 Replace itervalues() with values() 2016-03-10 16:43:37 +00:00
Daniel Martí ce18d1cc85 Port to python3's configparser 2016-03-10 16:43:37 +00:00
Daniel Martí 2493e705f2 lint: remove sets usage 2016-03-10 16:43:37 +00:00
Daniel Martí ec301b8566 common: update base64 encoding of bytes 2016-03-10 16:43:37 +00:00
Daniel Martí 920ae4692f Port all imports to python3 2016-03-10 16:43:37 +00:00
Daniel Martí 11b8b1ca4f update: replace ord() with bytearray 2016-03-10 16:43:37 +00:00
Daniel Martí ee9a296b64 Make pre-commit hook pass after python3 switch 2016-03-10 16:43:37 +00:00
Daniel Martí 49ac25270e Run 2to3 on makebuildserver
Mostly just print conversion.
2016-03-10 16:43:37 +00:00
Daniel Martí d42c612c9a pre-commit: port to python3 2016-03-10 16:43:37 +00:00
Daniel Martí 099b45fcca Remove import workarounds for Python2 2016-03-10 16:43:37 +00:00
Daniel Martí f1f5836a66 Remove code that worked around python2 unicode 2016-03-10 16:43:37 +00:00
Daniel Martí e829b0f9e7 Get readmeta and rewritemeta running under python3 2016-03-10 16:43:37 +00:00
Daniel Martí 832b1224b9 Replace basestring with str 2016-03-10 16:43:37 +00:00
Daniel Martí 75419c1f04 Replace iteritems() with items() 2016-03-10 16:43:37 +00:00
Daniel Martí 6819c109fe Replace execfile with open+compile+exec 2016-03-10 16:43:37 +00:00
Daniel Martí ca5ee87b16 Switch to io.StringIO 2016-03-10 16:43:37 +00:00
Daniel Martí e3591cb7b8 Fix imports in Python 3
Since common and metadata import each other, we must import via
"fdroidserver.*".
2016-03-10 16:43:37 +00:00
Daniel Martí 99edd64372 Switch all headers to python3 2016-03-10 16:43:36 +00:00
Hans-Christoph Steiner b0ffc5ce4c Merge branch 'jenkins-makebs' into 'master'
Jenkins makebs improvements



See merge request !105
2016-03-10 11:27:15 +00:00
Daniel Martí 3317cb3654 jenkins: build a variety of apps 2016-03-10 11:22:43 +00:00
Daniel Martí 5374c1e332 jenkins: only build one version per app
Use a specific vercode instead of --latest since we want this to be as
stable as possible.
2016-03-10 11:22:12 +00:00
Daniel Martí 896d7240aa jenkins: update fdroiddata if existing
Also, when cloning, no need to specify the branch and only download that
one. We already have only a single branch. And forcing master isn't
necessary.
2016-03-10 11:21:13 +00:00
Daniel Martí 261cbcd3ee build: don't remove wrapper dir gradle/
The point of removing these was to make sure that gradlew wasn't used,
and that our gradle was used instead. Removing the scripts already
accomplishes this.

Removing gradle/ should be harmless, but some apps like I2P re-use this
directory to also hold other stuff that is actually needed. So be safer
and don't remove it at all.
2016-03-08 23:50:14 +00:00
Daniel Martí ace4834cf7 lint: Also warn about gitlab links missing /issues 2016-03-07 22:30:52 +00:00
Daniel Martí 38d8778200 README: Use new CI badge url 2016-03-07 20:53:58 +00:00
Daniel Martí 3c3e8e5b85 Merge branch 'import' into 'master'
import: Fix usage of .git suffix for gitlab urls



See merge request !107
2016-03-06 11:32:05 +00:00
Boris Kraut f4ce1737d9 import: use .git suffix only for repo-url 2016-03-06 11:20:10 +01:00
Daniel Martí 495b2057ed README: Fix CI badge
The old /ci link no longer works. Use the builds page instead.
2016-03-05 23:54:33 +00:00
Daniel Martí c2cf6b1982 CI: Install missing gcc and python-dev packages 2016-03-05 19:22:23 +00:00
Daniel Martí 920f11d047 lint: error on fdroid import disable line 2016-03-03 14:19:32 +00:00
Daniel Martí d4f7097638 CI: No longer needed to install any deps
All the deps come installed in the image now. This saves up a little
time (especially the apt-get update) and makes the CI script much
simpler.
2016-02-29 23:38:54 +00:00
Daniel Martí 6264222fb6 CI: Use our own image 2016-02-29 19:56:02 +00:00
Daniel Martí bf32477433 Merge branch 'p1' into 'master'
Fix pubkey extraction on update

Replacement of !86.

Fix pubkey extraction in case of non-empty _JAVA_OPTIONS. Fixes #133.

I didn't actually run the test suite (it looks like there are some preparations to be done for that), but I checked the commands from `test_fdroid_popen_stderr_redirect` in ipython.

See merge request !103
2016-02-28 13:37:17 +00:00
Daniel Martí 9f95c0bbdb Merge branch 'faster-ci' into 'master'
CI: Install Android SDK only if necessary



See merge request !106
2016-02-28 13:35:57 +00:00
Daniel Martí 8106d4ffde CI: Install Android SDK only if necessary 2016-02-27 19:56:32 +00:00
Daniel Martí e3f60e2b78 common: make jdk detection more strict
We weren't using ^ and $, so stuff like java-8-openjdk-i386 would match
both the Arch and the Debian regexes. A list with one regex per line in
the same format is also easier to read and maintain.

This might be why java8 isn't being detected properly on our Debian
stable buildserver.
2016-02-23 12:43:58 +00:00