Skip to content
This repository was archived by the owner on Feb 1, 2022. It is now read-only.

Upgrade kinto-changes#109

Merged
Natim merged 3 commits into2.Xfrom
upgrade-kinto-changes-1.0.0
Feb 16, 2017
Merged

Upgrade kinto-changes#109
Natim merged 3 commits into2.Xfrom
upgrade-kinto-changes-1.0.0

Conversation

@leplatrem
Copy link
Copy Markdown
Collaborator

@leplatrem leplatrem commented Feb 14, 2017

I created a 2.X branch to ease maintenance of stable version (master)

@leplatrem leplatrem requested a review from Natim February 14, 2017 16:58
Natim
Natim suggested changes Feb 14, 2017
View reviewed changes
CHANGELOG.rst

.. code-block :: ini

kinto.event_listeners = changes
Copy link
Copy Markdown
Contributor

@Natim Natim Feb 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we need to apply this changes to the test config file too.

@leplatrem
Copy link
Copy Markdown
Collaborator Author

leplatrem commented Feb 15, 2017 

xml-verifier 'https://blocklist.addons.mozilla.org/blocklist/3/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/46.0/' 'http://localhost:8888/v1/blocklist/3/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/46.0/'
/home/travis/gopath/src/github.com/mozilla-services/kinto-dist/.venv/local/lib/python2.7/site-packages/requests/packages/urllib3/util/ssl_.py:334: SNIMissingWarning: An HTTPS request has been made, but the SNI (Subject Name Indication) extension to TLS is not available on this platform. This may cause the server to present an incorrect TLS certificate, which can cause validation failures. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings
  SNIMissingWarning
  /home/travis/gopath/src/github.com/mozilla-services/kinto-dist/.venv/local/lib/python2.7/site-packages/requests/packages/urllib3/util/ssl_.py:132: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings
  InsecurePlatformWarning
  /home/travis/gopath/src/github.com/mozilla-services/kinto-dist/.venv/local/lib/python2.7/site-packages/requests/packages/urllib3/util/ssl_.py:132: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings
  InsecurePlatformWarning
  "GET   /v1/blocklist/3/%5C%7Bec8030f7-c20a-464f-9b0e-13a3a9e97384%5C%7D/46.0/" 200 (68 ms) request.summary agent=python-requests/2.12.5 authn_type=None errno=None lang=None time=2017-02-15T09:12:15 uid=None
--- /tmp/tmp5CTXbD  2017-02-15 09:12:15.717567856 +0000
+++ /tmp/tmpJ8GI7r  2017-02-15 09:12:15.717567856 +0000
@@ -7355,36 +7355,25 @@
                     }, 
                     "versionRange": {
                         "@maxVersion": "18.0.0.366", 
                         "@minVersion": "18.0.0.360", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1274", 
                     -                    "@os": "", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "22.0.0.211", 
                         "@minVersion": "22.0.0.192", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p129", 
                     "match": {
                     @@ -7437,159 +7426,96 @@
                         "@maxVersion": "18.0.0.382", 
                         "@minVersion": "18.0.0.366", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1419", 
                     "@os": "Linux", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "libflashplayer\\.so", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "libflashplayer\\.so", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "11.2.202.643", 
                         "@minVersion": "11.2.202.637", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1420", 
                     -                    "@os": "", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "23.0.0.205", 
                         "@minVersion": "23.0.0.185", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1421", 
                     "@os": "Linux", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "libflashplayer\\.so", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "libflashplayer\\.so", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "23.0.0.207", 
                         "@minVersion": "11.2.202.643", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1422", 
                     -                    "@os": "", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "23.0.0.207", 
                         "@minVersion": "23.0.0.205", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1494", 
                     -                    "@os": "", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "(NPSWF32.*\\.dll)|(NPSWF64.*\\.dll)|(Flash\\ Player\\.plugin)", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "24.0.0.186", 
                         "@minVersion": "23.0.0.207", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p1495", 
                     "@os": "Linux", 
                     "infoURL": "https://get.adobe.com/flashplayer/", 
                     -                    "match": [
-                        {
-                            "@exp": "", 
-                            "@name": "description"
-                        }, 
-                        {
-                            "@exp": "libflashplayer\\.so", 
-                            "@name": "filename"
-                        }, 
-                        {
-                            "@exp": "", 
-                            "@name": "name"
-                        }
-                    ], 
+                    "match": {
+                        "@exp": "libflashplayer\\.so", 
+                        "@name": "filename"
+                    }, 
                     "versionRange": {
                         "@maxVersion": "24.0.0.186", 
                         "@minVersion": "23.0.0.207", 
                         "@severity": "0", 
                         "@vulnerabilitystatus": "1"
                     }
                 }, 
                 {
                     "@blockID": "p152", 
                     "match": {

@Natim
Copy link
Copy Markdown
Contributor

Natim commented Feb 15, 2017 •
edited
Loading

Ping @jvillalobos this refs: https://bugzilla.mozilla.org/show_bug.cgi?id=1339500

I really think we should remove the empty fields using the kinto-admin.

@n1k0 has been working on a patch to ease that: rjsf-team/react-jsonschema-form#472

@Natim Natim mentioned this pull request Feb 15, 2017
Closed
@Natim
Copy link
Copy Markdown
Contributor

Natim commented Feb 16, 2017 •
edited
Loading

Ok the bug have been fixed. I guess we should start removing the xml-verifier from the functional test because we are no longer using json2kinto to sync between AMO and Kinto.

Natim
Natim reviewed Feb 16, 2017
View reviewed changes
setup.py

setup(name='kinto-dist',
version='1.13.0.dev0',
version='2.0.0.dev0',
Copy link
Copy Markdown
Contributor

@Natim Natim Feb 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are getting a 2.0 there, I would like to merge the remove-py27 support and upgrade to Python > 3.5 and PostgreSQL > 9.5 at the same time.

@Natim Natim merged commit 73cab23 into 2.X Feb 16, 2017
@Natim Natim deleted the upgrade-kinto-changes-1.0.0 branch February 16, 2017 09:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@Natim Natim Natim approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@leplatrem @Natim