Merge branch 'apk_output_location' into 'master'

handle gradle-plugin 3.0 output apk location

Closes #363

See merge request !321

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e17d7c88beff927fcca31ea102b040d8715c328..6ce9064e37f70e86ddc45ab9d6faa9b47d7534d3 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,34 +6,20 @@ test:
     - cd tests
     - ./complete-ci-tests
 
-# Test that the parsing of the .txt format didn't change. The metadata
-# fields 'Author Web Site', 'antifeatures=', 'buildozer=', and 'sudo='
-# where added after 0.7.0, so that can't be part of the test.
+# Test that the parsing of the .txt format didn't change 
+# from last released version.
 metadata_v0:
   script:
     - cd tests
-    - cp dump_internal_metadata_format.py dump.py # since this isn't in old commits
     - export GITCOMMIT=`git describe`
-    - git checkout 0.7.0  # or any old commit of your choosing
+    - git checkout 0.8  # bump after release
     - cd ..
-    - sed -i "s/'Author Email',/'Author Email',\n'Author Web Site',/" fdroidserver/metadata.py
     - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata
     - cd fdroiddata
-    - sed -i -e '/antifeatures=/d'
-             -e '/buildozer=/d'
-             -e '/sudo=/d'
-             metadata/*.txt
-    - ../tests/dump.py
+    - ../tests/dump_internal_metadata_format.py
     - cd ..
     - git reset --hard
     - git checkout $GITCOMMIT
     - cd fdroiddata
-    - ../tests/dump.py
-    - "sed -i -e '/AuthorWebSite/d'
-             -e '/Description: No description available/d'
-             -e \"/Description: ''/d\"
-             -e '/antifeatures:/d'
-             -e '/buildozer:/d'
-             -e '/sudo:/d'
-             metadata/dump_*/*.yaml"
+    - ../tests/dump_internal_metadata_format.py
     - diff -uw metadata/dump_*

diff --git a/makebuildserver b/makebuildserver
index df553fa2df61cdc40aa6065811624747709f5c87..dea15f669ab39a1b34bf1aff19ed307c4e7d55ba 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -172,10 +172,10 @@ cachefiles = [
      '4b4bcddead3319708275c54c76294707bfaa953d767e34f1a5b599f3edd0076c'),
     ('https://dl.google.com/android/repository/platform-24_r02.zip',
      'f268f5945c6ece7ea95c1c252067280854d2a20da924e22ae4720287df8bdbc9'),
-    ('https://dl.google.com/android/repository/platform-25_r01.zip',
-     'da519dc3e07b8cb879265c94f798262c1f90791dfaa8b745d34883891378438e'),
-    ('https://dl.google.com/android/repository/platform-26_r01.zip',
-     '44e7eca5923320db1abb422aa7a3d0ac9ee199a379af6f5c7603e714d7717561'),
+    ('https://dl.google.com/android/repository/platform-25_r03.zip',
+     '9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8'),
+    ('https://dl.google.com/android/repository/platform-26_r02.zip',
+     '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -238,6 +238,8 @@ cachefiles = [
      '152c1b187947edd10c65af8b279d40321ecc106106323e53df3608e578042d65'),
     ('https://dl.google.com/android/repository/build-tools_r26-linux.zip',
      '7422682f92fb471d4aad4c053c9982a9a623377f9d5e4de7a73cd44ebf2f3c61'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip',
+     'c8617f25a7de2aeb9ddcacf1aeb413e053d5ed5ef4a3f31fe0ce21d4428ee0ea'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -391,7 +393,7 @@ def update_cache(cachedir, cachefiles):
 
         if download:
             r = requests.get(srcurl, headers=resume_header,
-                             stream=True, verify=False, allow_redirects=True)
+                             stream=True, allow_redirects=True)
             content_length = int(r.headers.get('content-length'))
             with open(local_filename, 'ab') as f:
                 for chunk in progress.bar(r.iter_content(chunk_size=65536),

diff --git a/setup.py b/setup.py
index 12e2476b00ac2448c1d510a1e96465796706cb55..6ee8c3a8b60dbe19eaabd5424820e1032589f765 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,8 @@ setup(name='fdroidserver',
           'python-vagrant',
           'PyYAML',
           'ruamel.yaml >= 0.13',
-          'requests < 2.11',
-          'docker-py == 1.9.0',
+          'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
+          'docker-py >= 1.9, < 2.0',
       ],
       classifiers=[
           'Development Status :: 4 - Beta',