{"action":"closed","number":193,"pull_request":{"url":"https://api.github.com/repos/NSLS-II/ophyd/pulls/193","id":55571664,"html_url":"https://github.com/NSLS-II/ophyd/pull/193","diff_url":"https://github.com/NSLS-II/ophyd/pull/193.diff","patch_url":"https://github.com/NSLS-II/ophyd/pull/193.patch","issue_url":"https://api.github.com/repos/NSLS-II/ophyd/issues/193","number":193,"state":"closed","locked":false,"title":"MNT: Flatten file structure","user":{"login":"danielballan","id":2279598,"avatar_url":"https://avatars.githubusercontent.com/u/2279598?v=3","gravatar_id":"","url":"https://api.github.com/users/danielballan","html_url":"https://github.com/danielballan","followers_url":"https://api.github.com/users/danielballan/followers","following_url":"https://api.github.com/users/danielballan/following{/other_user}","gists_url":"https://api.github.com/users/danielballan/gists{/gist_id}","starred_url":"https://api.github.com/users/danielballan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danielballan/subscriptions","organizations_url":"https://api.github.com/users/danielballan/orgs","repos_url":"https://api.github.com/users/danielballan/repos","events_url":"https://api.github.com/users/danielballan/events{/privacy}","received_events_url":"https://api.github.com/users/danielballan/received_events","type":"User","site_admin":false},"body":"as discussed with @dchabot, @klauer, and @tacaswell: while we are in the business of breaking the ophyd API anyway, we are flattening the namespace. Everything in ophyd/controls/ is moved to ophyd/.\r\n\r\nThe motivation for this change is partly \"less typing\" and partly reflection on [this talk](https://www.youtube.com/watch?v=o9pEzgHorH0). One of the points in the talk: the standard library modules have namespaces that are relatively flat, and it works well for core Python.\r\n\r\nRenamed using:\r\n`find ./ -iname \"*.py\" | xargs sed -i \"s/from \\.controls import/from .\r\nimport/g\" && find ./ -iname \"*.py\" | xargs sed -i \"s/\\.controls//g\"`\r\n\r\n...plus two or three manual edits. A look at `git grep controls` seems to confirm that I scrubbed it, but we'll have to wait for Travis to tell us whether I broke things.","created_at":"2016-01-10T19:06:52Z","updated_at":"2016-01-11T00:06:41Z","closed_at":"2016-01-11T00:06:41Z","merged_at":"2016-01-11T00:06:41Z","merge_commit_sha":"df6ebe18a70501ab48f325e616fd9fa3f4df63d2","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/NSLS-II/ophyd/pulls/193/commits","review_comments_url":"https://api.github.com/repos/NSLS-II/ophyd/pulls/193/comments","review_comment_url":"https://api.github.com/repos/NSLS-II/ophyd/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NSLS-II/ophyd/issues/193/comments","statuses_url":"https://api.github.com/repos/NSLS-II/ophyd/statuses/c1e3024527c372c09b77a97befbdf5a3d39a69ac","head":{"label":"danielballan:flattening","ref":"flattening","sha":"c1e3024527c372c09b77a97befbdf5a3d39a69ac","user":{"login":"danielballan","id":2279598,"avatar_url":"https://avatars.githubusercontent.com/u/2279598?v=3","gravatar_id":"","url":"https://api.github.com/users/danielballan","html_url":"https://github.com/danielballan","followers_url":"https://api.github.com/users/danielballan/followers","following_url":"https://api.github.com/users/danielballan/following{/other_user}","gists_url":"https://api.github.com/users/danielballan/gists{/gist_id}","starred_url":"https://api.github.com/users/danielballan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danielballan/subscriptions","organizations_url":"https://api.github.com/users/danielballan/orgs","repos_url":"https://api.github.com/users/danielballan/repos","events_url":"https://api.github.com/users/danielballan/events{/privacy}","received_events_url":"https://api.github.com/users/danielballan/received_events","type":"User","site_admin":false},"repo":{"id":33561494,"name":"ophyd","full_name":"danielballan/ophyd","owner":{"login":"danielballan","id":2279598,"avatar_url":"https://avatars.githubusercontent.com/u/2279598?v=3","gravatar_id":"","url":"https://api.github.com/users/danielballan","html_url":"https://github.com/danielballan","followers_url":"https://api.github.com/users/danielballan/followers","following_url":"https://api.github.com/users/danielballan/following{/other_user}","gists_url":"https://api.github.com/users/danielballan/gists{/gist_id}","starred_url":"https://api.github.com/users/danielballan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danielballan/subscriptions","organizations_url":"https://api.github.com/users/danielballan/orgs","repos_url":"https://api.github.com/users/danielballan/repos","events_url":"https://api.github.com/users/danielballan/events{/privacy}","received_events_url":"https://api.github.com/users/danielballan/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/danielballan/ophyd","description":"Python/EPICS based data collection for NSLS-II","fork":true,"url":"https://api.github.com/repos/danielballan/ophyd","forks_url":"https://api.github.com/repos/danielballan/ophyd/forks","keys_url":"https://api.github.com/repos/danielballan/ophyd/keys{/key_id}","collaborators_url":"https://api.github.com/repos/danielballan/ophyd/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/danielballan/ophyd/teams","hooks_url":"https://api.github.com/repos/danielballan/ophyd/hooks","issue_events_url":"https://api.github.com/repos/danielballan/ophyd/issues/events{/number}","events_url":"https://api.github.com/repos/danielballan/ophyd/events","assignees_url":"https://api.github.com/repos/danielballan/ophyd/assignees{/user}","branches_url":"https://api.github.com/repos/danielballan/ophyd/branches{/branch}","tags_url":"https://api.github.com/repos/danielballan/ophyd/tags","blobs_url":"https://api.github.com/repos/danielballan/ophyd/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/danielballan/ophyd/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/danielballan/ophyd/git/refs{/sha}","trees_url":"https://api.github.com/repos/danielballan/ophyd/git/trees{/sha}","statuses_url":"https://api.github.com/repos/danielballan/ophyd/statuses/{sha}","languages_url":"https://api.github.com/repos/danielballan/ophyd/languages","stargazers_url":"https://api.github.com/repos/danielballan/ophyd/stargazers","contributors_url":"https://api.github.com/repos/danielballan/ophyd/contributors","subscribers_url":"https://api.github.com/repos/danielballan/ophyd/subscribers","subscription_url":"https://api.github.com/repos/danielballan/ophyd/subscription","commits_url":"https://api.github.com/repos/danielballan/ophyd/commits{/sha}","git_commits_url":"https://api.github.com/repos/danielballan/ophyd/git/commits{/sha}","comments_url":"https://api.github.com/repos/danielballan/ophyd/comments{/number}","issue_comment_url":"https://api.github.com/repos/danielballan/ophyd/issues/comments{/number}","contents_url":"https://api.github.com/repos/danielballan/ophyd/contents/{+path}","compare_url":"https://api.github.com/repos/danielballan/ophyd/compare/{base}...{head}","merges_url":"https://api.github.com/repos/danielballan/ophyd/merges","archive_url":"https://api.github.com/repos/danielballan/ophyd/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/danielballan/ophyd/downloads","issues_url":"https://api.github.com/repos/danielballan/ophyd/issues{/number}","pulls_url":"https://api.github.com/repos/danielballan/ophyd/pulls{/number}","milestones_url":"https://api.github.com/repos/danielballan/ophyd/milestones{/number}","notifications_url":"https://api.github.com/repos/danielballan/ophyd/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/danielballan/ophyd/labels{/name}","releases_url":"https://api.github.com/repos/danielballan/ophyd/releases{/id}","created_at":"2015-04-07T18:43:53Z","updated_at":"2015-04-07T20:48:43Z","pushed_at":"2016-01-10T19:24:02Z","git_url":"git://github.com/danielballan/ophyd.git","ssh_url":"git@github.com:danielballan/ophyd.git","clone_url":"https://github.com/danielballan/ophyd.git","svn_url":"https://github.com/danielballan/ophyd","homepage":"http://nsls-ii.github.io/","size":1731,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"NSLS-II:master","ref":"master","sha":"8fd9ebcc2c84b554d797173a508ff4c5f2fa6f02","user":{"login":"NSLS-II","id":8700262,"avatar_url":"https://avatars.githubusercontent.com/u/8700262?v=3","gravatar_id":"","url":"https://api.github.com/users/NSLS-II","html_url":"https://github.com/NSLS-II","followers_url":"https://api.github.com/users/NSLS-II/followers","following_url":"https://api.github.com/users/NSLS-II/following{/other_user}","gists_url":"https://api.github.com/users/NSLS-II/gists{/gist_id}","starred_url":"https://api.github.com/users/NSLS-II/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NSLS-II/subscriptions","organizations_url":"https://api.github.com/users/NSLS-II/orgs","repos_url":"https://api.github.com/users/NSLS-II/repos","events_url":"https://api.github.com/users/NSLS-II/events{/privacy}","received_events_url":"https://api.github.com/users/NSLS-II/received_events","type":"Organization","site_admin":false},"repo":{"id":26235440,"name":"ophyd","full_name":"NSLS-II/ophyd","owner":{"login":"NSLS-II","id":8700262,"avatar_url":"https://avatars.githubusercontent.com/u/8700262?v=3","gravatar_id":"","url":"https://api.github.com/users/NSLS-II","html_url":"https://github.com/NSLS-II","followers_url":"https://api.github.com/users/NSLS-II/followers","following_url":"https://api.github.com/users/NSLS-II/following{/other_user}","gists_url":"https://api.github.com/users/NSLS-II/gists{/gist_id}","starred_url":"https://api.github.com/users/NSLS-II/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NSLS-II/subscriptions","organizations_url":"https://api.github.com/users/NSLS-II/orgs","repos_url":"https://api.github.com/users/NSLS-II/repos","events_url":"https://api.github.com/users/NSLS-II/events{/privacy}","received_events_url":"https://api.github.com/users/NSLS-II/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/NSLS-II/ophyd","description":"Python/EPICS based data collection for NSLS-II","fork":false,"url":"https://api.github.com/repos/NSLS-II/ophyd","forks_url":"https://api.github.com/repos/NSLS-II/ophyd/forks","keys_url":"https://api.github.com/repos/NSLS-II/ophyd/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NSLS-II/ophyd/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NSLS-II/ophyd/teams","hooks_url":"https://api.github.com/repos/NSLS-II/ophyd/hooks","issue_events_url":"https://api.github.com/repos/NSLS-II/ophyd/issues/events{/number}","events_url":"https://api.github.com/repos/NSLS-II/ophyd/events","assignees_url":"https://api.github.com/repos/NSLS-II/ophyd/assignees{/user}","branches_url":"https://api.github.com/repos/NSLS-II/ophyd/branches{/branch}","tags_url":"https://api.github.com/repos/NSLS-II/ophyd/tags","blobs_url":"https://api.github.com/repos/NSLS-II/ophyd/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NSLS-II/ophyd/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NSLS-II/ophyd/git/refs{/sha}","trees_url":"https://api.github.com/repos/NSLS-II/ophyd/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NSLS-II/ophyd/statuses/{sha}","languages_url":"https://api.github.com/repos/NSLS-II/ophyd/languages","stargazers_url":"https://api.github.com/repos/NSLS-II/ophyd/stargazers","contributors_url":"https://api.github.com/repos/NSLS-II/ophyd/contributors","subscribers_url":"https://api.github.com/repos/NSLS-II/ophyd/subscribers","subscription_url":"https://api.github.com/repos/NSLS-II/ophyd/subscription","commits_url":"https://api.github.com/repos/NSLS-II/ophyd/commits{/sha}","git_commits_url":"https://api.github.com/repos/NSLS-II/ophyd/git/commits{/sha}","comments_url":"https://api.github.com/repos/NSLS-II/ophyd/comments{/number}","issue_comment_url":"https://api.github.com/repos/NSLS-II/ophyd/issues/comments{/number}","contents_url":"https://api.github.com/repos/NSLS-II/ophyd/contents/{+path}","compare_url":"https://api.github.com/repos/NSLS-II/ophyd/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NSLS-II/ophyd/merges","archive_url":"https://api.github.com/repos/NSLS-II/ophyd/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NSLS-II/ophyd/downloads","issues_url":"https://api.github.com/repos/NSLS-II/ophyd/issues{/number}","pulls_url":"https://api.github.com/repos/NSLS-II/ophyd/pulls{/number}","milestones_url":"https://api.github.com/repos/NSLS-II/ophyd/milestones{/number}","notifications_url":"https://api.github.com/repos/NSLS-II/ophyd/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NSLS-II/ophyd/labels{/name}","releases_url":"https://api.github.com/repos/NSLS-II/ophyd/releases{/id}","created_at":"2014-11-05T19:20:01Z","updated_at":"2015-12-10T23:37:22Z","pushed_at":"2016-01-11T00:06:41Z","git_url":"git://github.com/NSLS-II/ophyd.git","ssh_url":"git@github.com:NSLS-II/ophyd.git","clone_url":"https://github.com/NSLS-II/ophyd.git","svn_url":"https://github.com/NSLS-II/ophyd","homepage":"http://nsls-ii.github.io/","size":4587,"stargazers_count":3,"watchers_count":3,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":10,"mirror_url":null,"open_issues_count":38,"forks":10,"open_issues":38,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/NSLS-II/ophyd/pulls/193"},"html":{"href":"https://github.com/NSLS-II/ophyd/pull/193"},"issue":{"href":"https://api.github.com/repos/NSLS-II/ophyd/issues/193"},"comments":{"href":"https://api.github.com/repos/NSLS-II/ophyd/issues/193/comments"},"review_comments":{"href":"https://api.github.com/repos/NSLS-II/ophyd/pulls/193/comments"},"review_comment":{"href":"https://api.github.com/repos/NSLS-II/ophyd/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NSLS-II/ophyd/pulls/193/commits"},"statuses":{"href":"https://api.github.com/repos/NSLS-II/ophyd/statuses/c1e3024527c372c09b77a97befbdf5a3d39a69ac"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"tacaswell","id":199813,"avatar_url":"https://avatars.githubusercontent.com/u/199813?v=3","gravatar_id":"","url":"https://api.github.com/users/tacaswell","html_url":"https://github.com/tacaswell","followers_url":"https://api.github.com/users/tacaswell/followers","following_url":"https://api.github.com/users/tacaswell/following{/other_user}","gists_url":"https://api.github.com/users/tacaswell/gists{/gist_id}","starred_url":"https://api.github.com/users/tacaswell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tacaswell/subscriptions","organizations_url":"https://api.github.com/users/tacaswell/orgs","repos_url":"https://api.github.com/users/tacaswell/repos","events_url":"https://api.github.com/users/tacaswell/events{/privacy}","received_events_url":"https://api.github.com/users/tacaswell/received_events","type":"User","site_admin":false},"comments":2,"review_comments":0,"commits":3,"additions":87,"deletions":93,"changed_files":44}}