[Git][reproducible-builds/diffoscope][master] 2 commits: Update an Android manifest test to reflect that parsed XML attributes are...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
c01dc803 by Chris Lamb at 2019-11-23T20:19:54Z
Update an Android manifest test to reflect that parsed XML attributes are returned in a new/sorted manner under Python 3.8.

- - - - -
bfedb4fa by Chris Lamb at 2019-11-23T20:22:57Z
releasing package diffoscope version 131

- - - - -


4 changed files:

- debian/changelog
- diffoscope/__init__.py
- tests/comparators/test_apk.py
- tests/data/apk_manifest_expected_diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,19 @@
-diffoscope (131) UNRELEASED; urgency=medium
-
-  * WIP (generated upon release).
-
- -- Chris Lamb <lamby at debian.org>  Sun, 17 Nov 2019 19:57:52 -0500
+diffoscope (131) unstable; urgency=medium
+
+  * Clarify in the HTML and text outputs that the limits are per output format,
+    not global. (Closes: #944882, reproducible-builds/diffoscope#76)
+    - Bump the previous "max_page_size" limit from 400 kB to 4 MB.
+  * Update an Android manifest test to reflect that parsed XML attributes are
+    returned in a sorted or otherwise novel manner under Python 3.8.
+  * Update code to reflect version 19.10b0 of the black source code
+    reformatter and don't run our self-test for versions earlier than this as
+    it will generate different results and thus fail.
+  * Limit .dsc and .buildinfo matching; don't attempt to compare them as
+    ELF sections or similar. (Closes: reproducible-builds/diffoscope#77)
+  * Add a comment that the text_ascii{1,2} test fixture files are used in
+    multiple places so are not trivial to generate on the fly.
+
+ -- Chris Lamb <lamby at debian.org>  Sat, 23 Nov 2019 15:22:51 -0500
 
 diffoscope (130) unstable; urgency=medium
 


=====================================
diffoscope/__init__.py
=====================================
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "130"
+VERSION = "131"


=====================================
tests/comparators/test_apk.py
=====================================
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
+import sys
 import pytest
 
 from diffoscope.comparators.apk import ApkFile
@@ -63,6 +64,9 @@ def test_zipinfo(differences):
 
 
 @skip_unless_tools_exist('apktool', 'zipinfo')
+ at pytest.mark.skipif(
+    sys.version_info < (3, 8), reason="requires Python 3.8 or higher"
+)
 def test_android_manifest(differences):
     assert differences[1].source1 == 'AndroidManifest.xml (decoded)'
     assert differences[1].source2 == 'AndroidManifest.xml (decoded)'


=====================================
tests/data/apk_manifest_expected_diff
=====================================
@@ -1,7 +1,7 @@
 @@ -1,9 +1,9 @@
  <?xml version="1.0" encoding="utf-8"?>
--<manifest android:versionCode="1" android:versionName="1.0" package="com.any.any" platformBuildVersionCode="24" platformBuildVersionName="7.0.0" xmlns:android="http://schemas.android.com/apk/res/android">
-+<manifest android:versionCode="2" android:versionName="2.0" package="com.any.any" platformBuildVersionCode="24" platformBuildVersionName="7.0.0" xmlns:android="http://schemas.android.com/apk/res/android">
+-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.any.any" platformBuildVersionCode="24" platformBuildVersionName="7.0.0">
++<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2" android:versionName="2.0" package="com.any.any" platformBuildVersionCode="24" platformBuildVersionName="7.0.0">
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/69a8cc76d860678b4fabff197a5b128d527924c1...bfedb4fa1955c3ad12198dc06f3d80f39d65350d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/69a8cc76d860678b4fabff197a5b128d527924c1...bfedb4fa1955c3ad12198dc06f3d80f39d65350d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20191123/d9175b61/attachment.htm>