{"action":"created","comment":{"url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/comments/82035508","pull_request_review_id":2971017,"id":82035508,"diff_hunk":"@@ -14,8 +19,9 @@\n     author_email='info@scrapinghub.com',\n     url='http://github.com/scrapinghub/python-scrapinghub',\n     platforms = ['Any'],\n-    py_modules = ['scrapinghub'],\n-    install_requires = ['requests'],\n+    py_modules = ['scrapinghub', 'hubstorage'],","path":"setup.py","position":null,"original_position":21,"commit_id":"f2790e26aa5b9e2f95ad139bd816e02135bac542","original_commit_id":"87bee8718b2a5b5b471973682e8614f4a1f4ba50","user":{"login":"chekunkov","id":744331,"avatar_url":"https://avatars.githubusercontent.com/u/744331?v=3","gravatar_id":"","url":"https://api.github.com/users/chekunkov","html_url":"https://github.com/chekunkov","followers_url":"https://api.github.com/users/chekunkov/followers","following_url":"https://api.github.com/users/chekunkov/following{/other_user}","gists_url":"https://api.github.com/users/chekunkov/gists{/gist_id}","starred_url":"https://api.github.com/users/chekunkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chekunkov/subscriptions","organizations_url":"https://api.github.com/users/chekunkov/orgs","repos_url":"https://api.github.com/users/chekunkov/repos","events_url":"https://api.github.com/users/chekunkov/events{/privacy}","received_events_url":"https://api.github.com/users/chekunkov/received_events","type":"User","site_admin":false},"body":"> from scrapinghub import ... should work as before (I think it's only APIError and Connection\r\n\r\nbtw, ^ my fault, for backwards compatibility we need everything from `legacy.py` to be importable from `scrapinghub`. So you need to move `__all__ = [\"APIError\", \"Connection\", \"HubstorageClient\"]` from `scrapinghub/legacy.py` to `scrapinghub/__init__.py`, and add `from .legacy import *` to `scrapinghub/__init__.py`. If someone has `from scrapinghub import Project` their code will be broken by current change.","created_at":"2016-10-05T18:12:26Z","updated_at":"2016-10-05T18:12:26Z","html_url":"https://github.com/scrapinghub/python-scrapinghub/pull/28#discussion_r82035508","pull_request_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28","_links":{"self":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/comments/82035508"},"html":{"href":"https://github.com/scrapinghub/python-scrapinghub/pull/28#discussion_r82035508"},"pull_request":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28"}}},"pull_request":{"url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28","id":87472546,"html_url":"https://github.com/scrapinghub/python-scrapinghub/pull/28","diff_url":"https://github.com/scrapinghub/python-scrapinghub/pull/28.diff","patch_url":"https://github.com/scrapinghub/python-scrapinghub/pull/28.patch","issue_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/28","number":28,"state":"open","locked":false,"title":"Merge python-hubstorage","user":{"login":"vshlapakov","id":448111,"avatar_url":"https://avatars.githubusercontent.com/u/448111?v=3","gravatar_id":"","url":"https://api.github.com/users/vshlapakov","html_url":"https://github.com/vshlapakov","followers_url":"https://api.github.com/users/vshlapakov/followers","following_url":"https://api.github.com/users/vshlapakov/following{/other_user}","gists_url":"https://api.github.com/users/vshlapakov/gists{/gist_id}","starred_url":"https://api.github.com/users/vshlapakov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vshlapakov/subscriptions","organizations_url":"https://api.github.com/users/vshlapakov/orgs","repos_url":"https://api.github.com/users/vshlapakov/repos","events_url":"https://api.github.com/users/vshlapakov/events{/privacy}","received_events_url":"https://api.github.com/users/vshlapakov/received_events","type":"User","site_admin":false},"body":"1st step to merge the libraries with keeping history of both.\r\n\r\nRework of #27, based on [this](https://saintgimp.org/2013/01/22/merging-two-git-repositories-into-one-repository-without-losing-file-history/), looks like the current approach hasn't drawbacks of the subtree merge.\r\nWhat I've done here is basically:\r\n- moved scrapinghub repo files to a subfolder\r\n- added hubstorage repo as remote and merged it to this branch\r\n- moved hubstorage repo files to a subfolder\r\n- moved scrapinghub repo files back to root directory\r\n- sorted out common files, fixed scrapinghub tests\r\n\r\nThe PR provides API compatibility:\r\n```\r\n$ PYTHONPATH=./scrapinghub-1.8.0-py2.7.egg python\r\nPython 2.7.12 |Continuum Analytics, Inc.| (default, Jul  2 2016, 17:42:40) \r\n>>> from hubstorage import HubstorageClient\r\n>>> from scrapinghub import Job\r\n>>>\r\n\r\n$ PYTHONPATH=./scrapinghub-1.8.0-py3.5.egg python\r\nPython 3.5.2 |Continuum Analytics, Inc.| (default, Jul  2 2016, 17:53:06) \r\n>>> from scrapinghub import Job\r\n>>> from hubstorage import HubstorageClient\r\n>>>\r\n```\r\n\r\nSome important notes about reviewing the PR:\r\n- these folders were moved as-is \r\n\r\n1. (origin py-hs repo)/hubstorage -> hubstorage\r\n2. (origin py-hs repo)/tests -> tests/hubstorage\r\n3. scrapinghub/tests -> tests/scrapinghub\r\n\r\n- these files were moved from hubstorage repo root to scrapinghub repo root as-is:\r\n\r\n1. LICENSE\r\n2. Makefile\r\n3. MANIFEST.in\r\n4. README.rst -> README-hubstorage.rst\r\n5. requirements-pypy.txt\r\n\r\n- these files were merged/updated manually:\r\n\r\n1. setup.py\r\n2. requirements.txt\r\n3. requirements-test.txt\r\n4. tox.ini\r\n\r\nI haven't deleted a branch with subtree merge attempt, so you can compare results:\r\nhttps://github.com/scrapinghub/python-scrapinghub/tree/sc411/hubstorage\r\n\r\nReview, please.","created_at":"2016-09-30T10:48:46Z","updated_at":"2016-10-05T18:12:26Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7ad597c55aa09b27a375490757921d6bebb5efde","assignee":{"login":"chekunkov","id":744331,"avatar_url":"https://avatars.githubusercontent.com/u/744331?v=3","gravatar_id":"","url":"https://api.github.com/users/chekunkov","html_url":"https://github.com/chekunkov","followers_url":"https://api.github.com/users/chekunkov/followers","following_url":"https://api.github.com/users/chekunkov/following{/other_user}","gists_url":"https://api.github.com/users/chekunkov/gists{/gist_id}","starred_url":"https://api.github.com/users/chekunkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chekunkov/subscriptions","organizations_url":"https://api.github.com/users/chekunkov/orgs","repos_url":"https://api.github.com/users/chekunkov/repos","events_url":"https://api.github.com/users/chekunkov/events{/privacy}","received_events_url":"https://api.github.com/users/chekunkov/received_events","type":"User","site_admin":false},"assignees":[{"login":"chekunkov","id":744331,"avatar_url":"https://avatars.githubusercontent.com/u/744331?v=3","gravatar_id":"","url":"https://api.github.com/users/chekunkov","html_url":"https://github.com/chekunkov","followers_url":"https://api.github.com/users/chekunkov/followers","following_url":"https://api.github.com/users/chekunkov/following{/other_user}","gists_url":"https://api.github.com/users/chekunkov/gists{/gist_id}","starred_url":"https://api.github.com/users/chekunkov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chekunkov/subscriptions","organizations_url":"https://api.github.com/users/chekunkov/orgs","repos_url":"https://api.github.com/users/chekunkov/repos","events_url":"https://api.github.com/users/chekunkov/events{/privacy}","received_events_url":"https://api.github.com/users/chekunkov/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28/commits","review_comments_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28/comments","review_comment_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/comments{/number}","comments_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/28/comments","statuses_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/statuses/f2790e26aa5b9e2f95ad139bd816e02135bac542","head":{"label":"scrapinghub:sc412-1","ref":"sc412-1","sha":"f2790e26aa5b9e2f95ad139bd816e02135bac542","user":{"login":"scrapinghub","id":699596,"avatar_url":"https://avatars.githubusercontent.com/u/699596?v=3","gravatar_id":"","url":"https://api.github.com/users/scrapinghub","html_url":"https://github.com/scrapinghub","followers_url":"https://api.github.com/users/scrapinghub/followers","following_url":"https://api.github.com/users/scrapinghub/following{/other_user}","gists_url":"https://api.github.com/users/scrapinghub/gists{/gist_id}","starred_url":"https://api.github.com/users/scrapinghub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scrapinghub/subscriptions","organizations_url":"https://api.github.com/users/scrapinghub/orgs","repos_url":"https://api.github.com/users/scrapinghub/repos","events_url":"https://api.github.com/users/scrapinghub/events{/privacy}","received_events_url":"https://api.github.com/users/scrapinghub/received_events","type":"Organization","site_admin":false},"repo":{"id":2211875,"name":"python-scrapinghub","full_name":"scrapinghub/python-scrapinghub","owner":{"login":"scrapinghub","id":699596,"avatar_url":"https://avatars.githubusercontent.com/u/699596?v=3","gravatar_id":"","url":"https://api.github.com/users/scrapinghub","html_url":"https://github.com/scrapinghub","followers_url":"https://api.github.com/users/scrapinghub/followers","following_url":"https://api.github.com/users/scrapinghub/following{/other_user}","gists_url":"https://api.github.com/users/scrapinghub/gists{/gist_id}","starred_url":"https://api.github.com/users/scrapinghub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scrapinghub/subscriptions","organizations_url":"https://api.github.com/users/scrapinghub/orgs","repos_url":"https://api.github.com/users/scrapinghub/repos","events_url":"https://api.github.com/users/scrapinghub/events{/privacy}","received_events_url":"https://api.github.com/users/scrapinghub/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/scrapinghub/python-scrapinghub","description":"A client interface for Scrapinghub's API","fork":false,"url":"https://api.github.com/repos/scrapinghub/python-scrapinghub","forks_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/forks","keys_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/keys{/key_id}","collaborators_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/teams","hooks_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/hooks","issue_events_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/events{/number}","events_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/events","assignees_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/assignees{/user}","branches_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/branches{/branch}","tags_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/tags","blobs_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/refs{/sha}","trees_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/trees{/sha}","statuses_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/statuses/{sha}","languages_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/languages","stargazers_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/stargazers","contributors_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/contributors","subscribers_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/subscribers","subscription_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/subscription","commits_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/commits{/sha}","git_commits_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/commits{/sha}","comments_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/comments{/number}","issue_comment_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/comments{/number}","contents_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/contents/{+path}","compare_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/compare/{base}...{head}","merges_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/merges","archive_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/downloads","issues_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues{/number}","pulls_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls{/number}","milestones_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/milestones{/number}","notifications_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/labels{/name}","releases_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/releases{/id}","deployments_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/deployments","created_at":"2011-08-15T20:03:44Z","updated_at":"2016-07-28T14:40:14Z","pushed_at":"2016-10-04T16:54:16Z","git_url":"git://github.com/scrapinghub/python-scrapinghub.git","ssh_url":"git@github.com:scrapinghub/python-scrapinghub.git","clone_url":"https://github.com/scrapinghub/python-scrapinghub.git","svn_url":"https://github.com/scrapinghub/python-scrapinghub","homepage":"http://www.scrapinghub.com","size":481,"stargazers_count":53,"watchers_count":53,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":22,"mirror_url":null,"open_issues_count":7,"forks":22,"open_issues":7,"watchers":53,"default_branch":"master"}},"base":{"label":"scrapinghub:master","ref":"master","sha":"08eddb574544a6862d6d66466d79fbe2cf8ace1f","user":{"login":"scrapinghub","id":699596,"avatar_url":"https://avatars.githubusercontent.com/u/699596?v=3","gravatar_id":"","url":"https://api.github.com/users/scrapinghub","html_url":"https://github.com/scrapinghub","followers_url":"https://api.github.com/users/scrapinghub/followers","following_url":"https://api.github.com/users/scrapinghub/following{/other_user}","gists_url":"https://api.github.com/users/scrapinghub/gists{/gist_id}","starred_url":"https://api.github.com/users/scrapinghub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scrapinghub/subscriptions","organizations_url":"https://api.github.com/users/scrapinghub/orgs","repos_url":"https://api.github.com/users/scrapinghub/repos","events_url":"https://api.github.com/users/scrapinghub/events{/privacy}","received_events_url":"https://api.github.com/users/scrapinghub/received_events","type":"Organization","site_admin":false},"repo":{"id":2211875,"name":"python-scrapinghub","full_name":"scrapinghub/python-scrapinghub","owner":{"login":"scrapinghub","id":699596,"avatar_url":"https://avatars.githubusercontent.com/u/699596?v=3","gravatar_id":"","url":"https://api.github.com/users/scrapinghub","html_url":"https://github.com/scrapinghub","followers_url":"https://api.github.com/users/scrapinghub/followers","following_url":"https://api.github.com/users/scrapinghub/following{/other_user}","gists_url":"https://api.github.com/users/scrapinghub/gists{/gist_id}","starred_url":"https://api.github.com/users/scrapinghub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scrapinghub/subscriptions","organizations_url":"https://api.github.com/users/scrapinghub/orgs","repos_url":"https://api.github.com/users/scrapinghub/repos","events_url":"https://api.github.com/users/scrapinghub/events{/privacy}","received_events_url":"https://api.github.com/users/scrapinghub/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/scrapinghub/python-scrapinghub","description":"A client interface for Scrapinghub's API","fork":false,"url":"https://api.github.com/repos/scrapinghub/python-scrapinghub","forks_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/forks","keys_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/keys{/key_id}","collaborators_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/teams","hooks_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/hooks","issue_events_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/events{/number}","events_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/events","assignees_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/assignees{/user}","branches_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/branches{/branch}","tags_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/tags","blobs_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/refs{/sha}","trees_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/trees{/sha}","statuses_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/statuses/{sha}","languages_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/languages","stargazers_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/stargazers","contributors_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/contributors","subscribers_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/subscribers","subscription_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/subscription","commits_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/commits{/sha}","git_commits_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/git/commits{/sha}","comments_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/comments{/number}","issue_comment_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/comments{/number}","contents_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/contents/{+path}","compare_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/compare/{base}...{head}","merges_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/merges","archive_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/downloads","issues_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues{/number}","pulls_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls{/number}","milestones_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/milestones{/number}","notifications_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/labels{/name}","releases_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/releases{/id}","deployments_url":"https://api.github.com/repos/scrapinghub/python-scrapinghub/deployments","created_at":"2011-08-15T20:03:44Z","updated_at":"2016-07-28T14:40:14Z","pushed_at":"2016-10-04T16:54:16Z","git_url":"git://github.com/scrapinghub/python-scrapinghub.git","ssh_url":"git@github.com:scrapinghub/python-scrapinghub.git","clone_url":"https://github.com/scrapinghub/python-scrapinghub.git","svn_url":"https://github.com/scrapinghub/python-scrapinghub","homepage":"http://www.scrapinghub.com","size":481,"stargazers_count":53,"watchers_count":53,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":22,"mirror_url":null,"open_issues_count":7,"forks":22,"open_issues":7,"watchers":53,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28"},"html":{"href":"https://github.com/scrapinghub/python-scrapinghub/pull/28"},"issue":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/28"},"comments":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/issues/28/comments"},"review_comments":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28/comments"},"review_comment":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/pulls/28/commits"},"statuses":{"href":"https://api.github.com/repos/scrapinghub/python-scrapinghub/statuses/f2790e26aa5b9e2f95ad139bd816e02135bac542"}}}}
{"actor":{"display_login":"chekunkov"}}