{"action":"closed","number":106,"pull_request":{"url":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/106","id":56479831,"html_url":"https://github.com/spacetelescope/PyFITS/pull/106","diff_url":"https://github.com/spacetelescope/PyFITS/pull/106.diff","patch_url":"https://github.com/spacetelescope/PyFITS/pull/106.patch","issue_url":"https://api.github.com/repos/spacetelescope/PyFITS/issues/106","number":106,"state":"closed","locked":false,"title":"Astropy merge","user":{"login":"embray","id":676149,"avatar_url":"https://avatars.githubusercontent.com/u/676149?v=3","gravatar_id":"","url":"https://api.github.com/users/embray","html_url":"https://github.com/embray","followers_url":"https://api.github.com/users/embray/followers","following_url":"https://api.github.com/users/embray/following{/other_user}","gists_url":"https://api.github.com/users/embray/gists{/gist_id}","starred_url":"https://api.github.com/users/embray/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/embray/subscriptions","organizations_url":"https://api.github.com/users/embray/orgs","repos_url":"https://api.github.com/users/embray/repos","events_url":"https://api.github.com/users/embray/events{/privacy}","received_events_url":"https://api.github.com/users/embray/received_events","type":"User","site_admin":false},"body":"Merges I think almost all changes that have been made directly in `astropy.io.fits` since last time I did any merging between the two.\r\n\r\nTo be clear, for a long time I used to try to make all changes first in PyFITS, and then port that change directly over to astropy, for which I had a pretty easy process.  But because stand-alone PyFITS development has wound down I stopped doing that and started making and accepting changes directly to Astropy, while making no updates on the PyFITS end.\r\n\r\nHowever, I did want to do one last stand-alone PyFITS release with all the latest (relevant) updates.  There were a handful excluded due to reliance on Astropy-only features.\r\n\r\nThere's no mystery to how this was done--I created a patch set from changes in `astropy/io/fits` and `docs/io/fits` since the last time I merged from pyfits into astropy.  I then ran `sed` over the patch files to change the paths to the relevant paths in pyfits and applied the patches in sequence using `git am`.  Several patches were skipped due to their inapplicability.  Also had to make a few other manual interventions to, for example, bring over Python and Numpy compatibility tweaks from Astropy.  Most patches also required a bit of manual intervention to fix up things like imports.\r\n\r\nThere have been a few other changes in `astropy.io.fits` since I first created the patch set this was based on, so I want to add those changes to this PR before merging.  I also want to add something in the changelog about this.  The documentation build also needs testing.","created_at":"2016-01-19T15:21:03Z","updated_at":"2016-01-28T22:29:21Z","closed_at":"2016-01-28T22:29:21Z","merged_at":"2016-01-28T22:29:21Z","merge_commit_sha":"3aa99f3594974efd29b1bf6a2200de0e8301a8c0","assignee":null,"milestone":{"url":"https://api.github.com/repos/spacetelescope/PyFITS/milestones/10","html_url":"https://github.com/spacetelescope/PyFITS/milestones/v3.4.0","labels_url":"https://api.github.com/repos/spacetelescope/PyFITS/milestones/10/labels","id":724663,"number":10,"title":"v3.4.0","description":"","creator":{"login":"embray","id":676149,"avatar_url":"https://avatars.githubusercontent.com/u/676149?v=3","gravatar_id":"","url":"https://api.github.com/users/embray","html_url":"https://github.com/embray","followers_url":"https://api.github.com/users/embray/followers","following_url":"https://api.github.com/users/embray/following{/other_user}","gists_url":"https://api.github.com/users/embray/gists{/gist_id}","starred_url":"https://api.github.com/users/embray/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/embray/subscriptions","organizations_url":"https://api.github.com/users/embray/orgs","repos_url":"https://api.github.com/users/embray/repos","events_url":"https://api.github.com/users/embray/events{/privacy}","received_events_url":"https://api.github.com/users/embray/received_events","type":"User","site_admin":false},"open_issues":17,"closed_issues":2,"state":"open","created_at":"2014-07-17T20:53:40Z","updated_at":"2016-01-28T22:29:21Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/106/commits","review_comments_url":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/106/comments","review_comment_url":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/comments{/number}","comments_url":"https://api.github.com/repos/spacetelescope/PyFITS/issues/106/comments","statuses_url":"https://api.github.com/repos/spacetelescope/PyFITS/statuses/3cd4a7120c61aa547c99370ba59c7905f5dba0c1","head":{"label":"embray:astropy-merge","ref":"astropy-merge","sha":"3cd4a7120c61aa547c99370ba59c7905f5dba0c1","user":{"login":"embray","id":676149,"avatar_url":"https://avatars.githubusercontent.com/u/676149?v=3","gravatar_id":"","url":"https://api.github.com/users/embray","html_url":"https://github.com/embray","followers_url":"https://api.github.com/users/embray/followers","following_url":"https://api.github.com/users/embray/following{/other_user}","gists_url":"https://api.github.com/users/embray/gists{/gist_id}","starred_url":"https://api.github.com/users/embray/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/embray/subscriptions","organizations_url":"https://api.github.com/users/embray/orgs","repos_url":"https://api.github.com/users/embray/repos","events_url":"https://api.github.com/users/embray/events{/privacy}","received_events_url":"https://api.github.com/users/embray/received_events","type":"User","site_admin":false},"repo":{"id":7026054,"name":"PyFITS","full_name":"embray/PyFITS","owner":{"login":"embray","id":676149,"avatar_url":"https://avatars.githubusercontent.com/u/676149?v=3","gravatar_id":"","url":"https://api.github.com/users/embray","html_url":"https://github.com/embray","followers_url":"https://api.github.com/users/embray/followers","following_url":"https://api.github.com/users/embray/following{/other_user}","gists_url":"https://api.github.com/users/embray/gists{/gist_id}","starred_url":"https://api.github.com/users/embray/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/embray/subscriptions","organizations_url":"https://api.github.com/users/embray/orgs","repos_url":"https://api.github.com/users/embray/repos","events_url":"https://api.github.com/users/embray/events{/privacy}","received_events_url":"https://api.github.com/users/embray/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/embray/PyFITS","description":"Git repository for the PyFITS project; PyFITS is still actively maintained in SVN, but this repository exists to ease the migration into AstroPy (https://github.com/astropy/astropy)","fork":true,"url":"https://api.github.com/repos/embray/PyFITS","forks_url":"https://api.github.com/repos/embray/PyFITS/forks","keys_url":"https://api.github.com/repos/embray/PyFITS/keys{/key_id}","collaborators_url":"https://api.github.com/repos/embray/PyFITS/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/embray/PyFITS/teams","hooks_url":"https://api.github.com/repos/embray/PyFITS/hooks","issue_events_url":"https://api.github.com/repos/embray/PyFITS/issues/events{/number}","events_url":"https://api.github.com/repos/embray/PyFITS/events","assignees_url":"https://api.github.com/repos/embray/PyFITS/assignees{/user}","branches_url":"https://api.github.com/repos/embray/PyFITS/branches{/branch}","tags_url":"https://api.github.com/repos/embray/PyFITS/tags","blobs_url":"https://api.github.com/repos/embray/PyFITS/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/embray/PyFITS/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/embray/PyFITS/git/refs{/sha}","trees_url":"https://api.github.com/repos/embray/PyFITS/git/trees{/sha}","statuses_url":"https://api.github.com/repos/embray/PyFITS/statuses/{sha}","languages_url":"https://api.github.com/repos/embray/PyFITS/languages","stargazers_url":"https://api.github.com/repos/embray/PyFITS/stargazers","contributors_url":"https://api.github.com/repos/embray/PyFITS/contributors","subscribers_url":"https://api.github.com/repos/embray/PyFITS/subscribers","subscription_url":"https://api.github.com/repos/embray/PyFITS/subscription","commits_url":"https://api.github.com/repos/embray/PyFITS/commits{/sha}","git_commits_url":"https://api.github.com/repos/embray/PyFITS/git/commits{/sha}","comments_url":"https://api.github.com/repos/embray/PyFITS/comments{/number}","issue_comment_url":"https://api.github.com/repos/embray/PyFITS/issues/comments{/number}","contents_url":"https://api.github.com/repos/embray/PyFITS/contents/{+path}","compare_url":"https://api.github.com/repos/embray/PyFITS/compare/{base}...{head}","merges_url":"https://api.github.com/repos/embray/PyFITS/merges","archive_url":"https://api.github.com/repos/embray/PyFITS/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/embray/PyFITS/downloads","issues_url":"https://api.github.com/repos/embray/PyFITS/issues{/number}","pulls_url":"https://api.github.com/repos/embray/PyFITS/pulls{/number}","milestones_url":"https://api.github.com/repos/embray/PyFITS/milestones{/number}","notifications_url":"https://api.github.com/repos/embray/PyFITS/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/embray/PyFITS/labels{/name}","releases_url":"https://api.github.com/repos/embray/PyFITS/releases{/id}","deployments_url":"https://api.github.com/repos/embray/PyFITS/deployments","created_at":"2012-12-05T22:48:39Z","updated_at":"2014-06-19T18:27:00Z","pushed_at":"2016-01-28T22:28:59Z","git_url":"git://github.com/embray/PyFITS.git","ssh_url":"git@github.com:embray/PyFITS.git","clone_url":"https://github.com/embray/PyFITS.git","svn_url":"https://github.com/embray/PyFITS","homepage":"http://www.stsci.edu/resources/software_hardware/pyfits","size":15036,"stargazers_count":0,"watchers_count":0,"language":"C","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"spacetelescope:master","ref":"master","sha":"e610bba7dd31ad2d178a38e6dbe06b98f2e19fd8","user":{"login":"spacetelescope","id":2751928,"avatar_url":"https://avatars.githubusercontent.com/u/2751928?v=3","gravatar_id":"","url":"https://api.github.com/users/spacetelescope","html_url":"https://github.com/spacetelescope","followers_url":"https://api.github.com/users/spacetelescope/followers","following_url":"https://api.github.com/users/spacetelescope/following{/other_user}","gists_url":"https://api.github.com/users/spacetelescope/gists{/gist_id}","starred_url":"https://api.github.com/users/spacetelescope/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/spacetelescope/subscriptions","organizations_url":"https://api.github.com/users/spacetelescope/orgs","repos_url":"https://api.github.com/users/spacetelescope/repos","events_url":"https://api.github.com/users/spacetelescope/events{/privacy}","received_events_url":"https://api.github.com/users/spacetelescope/received_events","type":"Organization","site_admin":false},"repo":{"id":2578059,"name":"PyFITS","full_name":"spacetelescope/PyFITS","owner":{"login":"spacetelescope","id":2751928,"avatar_url":"https://avatars.githubusercontent.com/u/2751928?v=3","gravatar_id":"","url":"https://api.github.com/users/spacetelescope","html_url":"https://github.com/spacetelescope","followers_url":"https://api.github.com/users/spacetelescope/followers","following_url":"https://api.github.com/users/spacetelescope/following{/other_user}","gists_url":"https://api.github.com/users/spacetelescope/gists{/gist_id}","starred_url":"https://api.github.com/users/spacetelescope/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/spacetelescope/subscriptions","organizations_url":"https://api.github.com/users/spacetelescope/orgs","repos_url":"https://api.github.com/users/spacetelescope/repos","events_url":"https://api.github.com/users/spacetelescope/events{/privacy}","received_events_url":"https://api.github.com/users/spacetelescope/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/spacetelescope/PyFITS","description":"Git repository for the PyFITS project; PyFITS is still actively maintained in SVN, but this repository exists to ease the migration into AstroPy (https://github.com/astropy/astropy)","fork":false,"url":"https://api.github.com/repos/spacetelescope/PyFITS","forks_url":"https://api.github.com/repos/spacetelescope/PyFITS/forks","keys_url":"https://api.github.com/repos/spacetelescope/PyFITS/keys{/key_id}","collaborators_url":"https://api.github.com/repos/spacetelescope/PyFITS/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/spacetelescope/PyFITS/teams","hooks_url":"https://api.github.com/repos/spacetelescope/PyFITS/hooks","issue_events_url":"https://api.github.com/repos/spacetelescope/PyFITS/issues/events{/number}","events_url":"https://api.github.com/repos/spacetelescope/PyFITS/events","assignees_url":"https://api.github.com/repos/spacetelescope/PyFITS/assignees{/user}","branches_url":"https://api.github.com/repos/spacetelescope/PyFITS/branches{/branch}","tags_url":"https://api.github.com/repos/spacetelescope/PyFITS/tags","blobs_url":"https://api.github.com/repos/spacetelescope/PyFITS/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/spacetelescope/PyFITS/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/spacetelescope/PyFITS/git/refs{/sha}","trees_url":"https://api.github.com/repos/spacetelescope/PyFITS/git/trees{/sha}","statuses_url":"https://api.github.com/repos/spacetelescope/PyFITS/statuses/{sha}","languages_url":"https://api.github.com/repos/spacetelescope/PyFITS/languages","stargazers_url":"https://api.github.com/repos/spacetelescope/PyFITS/stargazers","contributors_url":"https://api.github.com/repos/spacetelescope/PyFITS/contributors","subscribers_url":"https://api.github.com/repos/spacetelescope/PyFITS/subscribers","subscription_url":"https://api.github.com/repos/spacetelescope/PyFITS/subscription","commits_url":"https://api.github.com/repos/spacetelescope/PyFITS/commits{/sha}","git_commits_url":"https://api.github.com/repos/spacetelescope/PyFITS/git/commits{/sha}","comments_url":"https://api.github.com/repos/spacetelescope/PyFITS/comments{/number}","issue_comment_url":"https://api.github.com/repos/spacetelescope/PyFITS/issues/comments{/number}","contents_url":"https://api.github.com/repos/spacetelescope/PyFITS/contents/{+path}","compare_url":"https://api.github.com/repos/spacetelescope/PyFITS/compare/{base}...{head}","merges_url":"https://api.github.com/repos/spacetelescope/PyFITS/merges","archive_url":"https://api.github.com/repos/spacetelescope/PyFITS/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/spacetelescope/PyFITS/downloads","issues_url":"https://api.github.com/repos/spacetelescope/PyFITS/issues{/number}","pulls_url":"https://api.github.com/repos/spacetelescope/PyFITS/pulls{/number}","milestones_url":"https://api.github.com/repos/spacetelescope/PyFITS/milestones{/number}","notifications_url":"https://api.github.com/repos/spacetelescope/PyFITS/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/spacetelescope/PyFITS/labels{/name}","releases_url":"https://api.github.com/repos/spacetelescope/PyFITS/releases{/id}","deployments_url":"https://api.github.com/repos/spacetelescope/PyFITS/deployments","created_at":"2011-10-14T18:44:47Z","updated_at":"2015-11-22T14:32:30Z","pushed_at":"2016-01-28T22:29:21Z","git_url":"git://github.com/spacetelescope/PyFITS.git","ssh_url":"git@github.com:spacetelescope/PyFITS.git","clone_url":"https://github.com/spacetelescope/PyFITS.git","svn_url":"https://github.com/spacetelescope/PyFITS","homepage":"http://www.stsci.edu/resources/software_hardware/pyfits","size":14090,"stargazers_count":15,"watchers_count":15,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":8,"mirror_url":null,"open_issues_count":46,"forks":8,"open_issues":46,"watchers":15,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/106"},"html":{"href":"https://github.com/spacetelescope/PyFITS/pull/106"},"issue":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/issues/106"},"comments":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/issues/106/comments"},"review_comments":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/106/comments"},"review_comment":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/pulls/106/commits"},"statuses":{"href":"https://api.github.com/repos/spacetelescope/PyFITS/statuses/3cd4a7120c61aa547c99370ba59c7905f5dba0c1"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"embray","id":676149,"avatar_url":"https://avatars.githubusercontent.com/u/676149?v=3","gravatar_id":"","url":"https://api.github.com/users/embray","html_url":"https://github.com/embray","followers_url":"https://api.github.com/users/embray/followers","following_url":"https://api.github.com/users/embray/following{/other_user}","gists_url":"https://api.github.com/users/embray/gists{/gist_id}","starred_url":"https://api.github.com/users/embray/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/embray/subscriptions","organizations_url":"https://api.github.com/users/embray/orgs","repos_url":"https://api.github.com/users/embray/repos","events_url":"https://api.github.com/users/embray/events{/privacy}","received_events_url":"https://api.github.com/users/embray/received_events","type":"User","site_admin":false},"comments":2,"review_comments":0,"commits":189,"additions":4277,"deletions":1447,"changed_files":57}}