{"action":"created","issue":{"url":"https://api.github.com/repos/glasserc/kinto/issues/1","repository_url":"https://api.github.com/repos/glasserc/kinto","labels_url":"https://api.github.com/repos/glasserc/kinto/issues/1/labels{/name}","comments_url":"https://api.github.com/repos/glasserc/kinto/issues/1/comments","events_url":"https://api.github.com/repos/glasserc/kinto/issues/1/events","html_url":"https://github.com/glasserc/kinto/pull/1","id":154727184,"number":1,"title":"WIP: finish merging Kinto and Cliquet","user":{"login":"glasserc","id":17006,"avatar_url":"https://avatars.githubusercontent.com/u/17006?v=3","gravatar_id":"","url":"https://api.github.com/users/glasserc","html_url":"https://github.com/glasserc","followers_url":"https://api.github.com/users/glasserc/followers","following_url":"https://api.github.com/users/glasserc/following{/other_user}","gists_url":"https://api.github.com/users/glasserc/gists{/gist_id}","starred_url":"https://api.github.com/users/glasserc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glasserc/subscriptions","organizations_url":"https://api.github.com/users/glasserc/orgs","repos_url":"https://api.github.com/users/glasserc/repos","events_url":"https://api.github.com/users/glasserc/events{/privacy}","received_events_url":"https://api.github.com/users/glasserc/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":9,"created_at":"2016-05-13T14:39:11Z","updated_at":"2016-05-17T13:48:18Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/glasserc/kinto/pulls/1","html_url":"https://github.com/glasserc/kinto/pull/1","diff_url":"https://github.com/glasserc/kinto/pull/1.diff","patch_url":"https://github.com/glasserc/kinto/pull/1.patch"},"body":"This is a prototype of what it might look like to merge Cliquet into Kinto. The actual merge itself is  d1e4fecb42b6ccc311722a71d29dfa097f0aaf87, which resolves conflicts in \"shared\" files like `requirements.txt`, `Makefile`, `setup.py`. This PR is about addressing the aftermath -- moving the `cliquet` package to `kinto.core`, moving the `cliquet_docs` into somewhere in the `docs` tree, and removing some of the duplicated/unneeded code now that the two projects are again one.\r\n\r\nOverall highlights:\r\n\r\n* all `cliquet.foo` settings are now `kinto.foo` settings\r\n* `cliquet` became `kinto/core`, except for `cliquet/tests` which became `kinto/tests/core`. This is necessary because everything in `kinto` has to have 100% coverage, which shouldn't be necessary for `kinto/core/tests`.\r\n* get rid of `kinto/core/scripts/cliquet.py`; keep only the `migrate` function, which now lives in `kinto/core/scripts.py`\r\n* `cliquet_docs` is now `docs/core` and it is no longer copied to Kinto docs\r\n* break backwards compatibility in a couple of important ways: no longer do anything fancy with \"prefixes\" in settings, and delete `initialize_cliquet`\r\n\r\nThere are still references in this project to cliquet_fxa and cliquet_pusher, which I considered outside the scope of this PR, but I'm interested in ideas on how to deal with this without breaking master.\r\n\r\nThis PR is against the `merge-from-cliquet` branch, which may eventually hit master, but in the meantime allows us to explore what it would look like to merge the cliquet and kinto repositories without breaking master (thanks @leplatrem for the idea)."},"comment":{"url":"https://api.github.com/repos/glasserc/kinto/issues/comments/219722682","html_url":"https://github.com/glasserc/kinto/pull/1#issuecomment-219722682","issue_url":"https://api.github.com/repos/glasserc/kinto/issues/1","id":219722682,"user":{"login":"leplatrem","id":546692,"avatar_url":"https://avatars.githubusercontent.com/u/546692?v=3","gravatar_id":"","url":"https://api.github.com/users/leplatrem","html_url":"https://github.com/leplatrem","followers_url":"https://api.github.com/users/leplatrem/followers","following_url":"https://api.github.com/users/leplatrem/following{/other_user}","gists_url":"https://api.github.com/users/leplatrem/gists{/gist_id}","starred_url":"https://api.github.com/users/leplatrem/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/leplatrem/subscriptions","organizations_url":"https://api.github.com/users/leplatrem/orgs","repos_url":"https://api.github.com/users/leplatrem/repos","events_url":"https://api.github.com/users/leplatrem/events{/privacy}","received_events_url":"https://api.github.com/users/leplatrem/received_events","type":"User","site_admin":false},"created_at":"2016-05-17T13:48:18Z","updated_at":"2016-05-17T13:48:18Z","body":"I think we're good! impressive work Ethan, congratz"}}