Skip to content
This repository was archived by the owner on Feb 1, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,48 @@ CHANGELOG
This document describes changes between each past release as well as
the version control of each dependency.

1.13.0 (unreleased)
===================
2.0.0 (unreleased)
==================

Configuration Breaking Changes
''''''''''''''''''''''''''''''

Before:

.. code-block :: ini

kinto.event_listeners = changes
Copy link
Copy Markdown
Contributor

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.

kinto.event_listeners.changes.use = kinto_changes.listener
kinto.event_listeners.changes.http_host = website.domain.tld
kinto.event_listeners.changes.collections = /buckets/settings
/buckets/blocklists/collections/certificates

Now:

.. code-block :: ini

kinto.changes.http_host = website.domain.tld
kinto.changes.resources = /buckets/settings
/buckets/blocklists/collections/certificates


kinto-changes
'''''''''''''

**kinto 0.5.0 → 1.0.0**: https://github.com/Kinto/kinto-changes/releases/tag/1.0

**Breaking changes**

- Nothing changed yet.
* The change endpoint **location is now hard-coded** (``/buckets/monitor/collections/changes/records``)
and cannot be configured.
* The permissions principals cannot be specified anymore.
The change endpoint is now **always public**.
* The ``monitor`` bucket and ``changes`` collection are not required anymore and
are not created anymore.
* ``POST`` and ``DELETE`` are not supported on the changes endpoint anymore.
* Individual entries (eg. ``/buckets/monitor/collections/changes/records/{id}``)
cannot be accessed anymore.
* The listener was dropped. Configuration must be changed (see above)


1.12.1 (2017-02-08)
Expand Down
11 changes: 3 additions & 8 deletions config/kinto.ini
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,9 @@ kinto.history.exclude_resources = /buckets/blocklists
#
# Kinto changes
#
kinto.event_listeners = changes
kinto.event_listeners.changes.use = kinto_changes.listener
kinto.event_listeners.changes.collections = /buckets/blocklists
/buckets/blocklists-preview
/buckets/destination/collections/destination
# kinto.event_listeners.changes.bucket = monitor
# kinto.event_listeners.changes.collection = changes
# kinto.event_listeners.changes.principals = system.Everyone
kinto.changes.resources = /buckets/blocklists
/buckets/blocklists-preview
/buckets/destination/collections/destination

#
# Kinto attachment
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jsonschema==2.6.0
kinto==5.3.5
kinto-amo==0.3.0
kinto-attachment==1.1.2
kinto-changes==0.5.0
kinto-changes==1.0.0
kinto-emailer==0.3.0
kinto-fxa==2.3.1
kinto-http==7.0.0
Expand Down Expand Up @@ -53,13 +53,13 @@ repoze.sendmail==4.3
requests==2.12.5
requests-hawk==1.0.0
ruamel.ordereddict==0.4.9
ruamel.yaml==0.13.13
ruamel.yaml==0.13.14
simplejson==3.10.0
six==1.10.0
SQLAlchemy==1.1.5
statsd==3.2.1
structlog==16.1.0
transaction==2.0.3
transaction==2.1.0
translationstring==1.3
typing==3.5.3.0
ujson==1.35
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def read_file(filename):
"kinto[postgresql,monitoring]>=5.3,<5.4",
"kinto-attachment>=1.1,<1.2",
"kinto-amo>=0.3.0,<0.4",
"kinto-changes>=0.5,<0.6",
"kinto-changes>=1.0.0,<1.1.0",
"kinto-emailer>=0.3.0,<0.4",
"kinto-signer>=1.2.0,<1.3.0",
"kinto-fxa>=2.3,<3.0",
Expand All @@ -31,7 +31,7 @@ def read_file(filename):
DEPENDENCY_LINKS = []

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

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.

description='Kinto Distribution',
long_description=README + "\n\n" + CHANGELOG,
license='Apache License (2.0)',
Expand Down
2 changes: 1 addition & 1 deletion smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ json2kinto --server $SERVER --addons-server https://addons.mozilla.org/ -S amo-b
http --check-status $SERVER/preview/3/$APPID/46.0/ | grep 'youtube'
# Final XML is identical to production
http --check-status $SERVER/blocklist/3/$APPID/46.0/ | grep 'youtube'
xml-verifier https://blocklist.addons.mozilla.org/blocklist/3/$APPID/46.0/ $SERVER/blocklist/3/$APPID/46.0/
# xml-verifier https://blocklist.addons.mozilla.org/blocklist/3/$APPID/46.0/ $SERVER/blocklist/3/$APPID/46.0/

# Expected monitored changes
http --check-status $SERVER/buckets/monitor/collections/changes/records | grep '"blocklists-preview"'
Expand Down