From 2bed28296cca2f80229fd89f6d545a1208b72ef3 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Fri, 2 Dec 2016 12:14:54 -0800 Subject: [PATCH 01/13] Update undiffable rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 10d8320..cd538aa 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ ======= -Astropies are nice +Astropies are very nice ======= .. image:: https://pypip.in/v/astropy/badge.png From 5c92862f0cd7a6e26c9e0ede8f792fe2547fd935 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Fri, 2 Dec 2016 12:29:28 -0800 Subject: [PATCH 02/13] Update .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 66cbc79..259ca90 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ **/*.rst -diff +**/*.c +diff From 2b8006b561385ce529e1cb3b6a6ed30524523974 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Fri, 2 Dec 2016 12:33:25 -0800 Subject: [PATCH 03/13] Create .gitattributes --- static/.gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 static/.gitattributes diff --git a/static/.gitattributes b/static/.gitattributes new file mode 100644 index 0000000..5b282ed --- /dev/null +++ b/static/.gitattributes @@ -0,0 +1 @@ +*.bmp -diff From 46ebb9cb81da94fd6fe913d7af8d8a86cb75dbbe Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 15:51:19 -0800 Subject: [PATCH 04/13] Update expat_config.h.cmake --- cextern/expat/expat_config.h.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cextern/expat/expat_config.h.cmake b/cextern/expat/expat_config.h.cmake index 25d79a6..3c3c0e6 100644 --- a/cextern/expat/expat_config.h.cmake +++ b/cextern/expat/expat_config.h.cmake @@ -1,4 +1,4 @@ -/* expat_config.h.in. Generated from configure.in by autoheader. */ +/* expat_config.h.in. Generated from configure.in by autoheader. Foo. */ /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ #cmakedefine BYTEORDER @BYTEORDER@ From aef560a3d80c6d1e287dc7533bc73867d41f50ff Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 15:53:15 -0800 Subject: [PATCH 05/13] Update .gitattributes --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 259ca90..64568fd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ **/*.rst -diff -**/*.c +diff +**/*.c -diff +**/expat/**/*.c diff From fb469cb7e18aa4d6bf3ab1875e60dd77f8e28bd4 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 15:53:56 -0800 Subject: [PATCH 06/13] Update expat_68k.c --- cextern/expat/amiga/expat_68k.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cextern/expat/amiga/expat_68k.c b/cextern/expat/amiga/expat_68k.c index aa4c6e2..aa42145 100644 --- a/cextern/expat/amiga/expat_68k.c +++ b/cextern/expat/amiga/expat_68k.c @@ -21,6 +21,8 @@ ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +// Foo test + /* ** Note: This file was originally automatically generated by fdtrans. */ From 56697a0ade4e14b93b2f455e71e5a822aacd9a58 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 15:54:34 -0800 Subject: [PATCH 07/13] Update buffers.c --- cextern/cfitsio/buffers.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cextern/cfitsio/buffers.c b/cextern/cfitsio/buffers.c index 8d80f46..fd5035d 100644 --- a/cextern/cfitsio/buffers.c +++ b/cextern/cfitsio/buffers.c @@ -5,6 +5,8 @@ /* Astrophysic Science Archive Research Center (HEASARC) at the NASA */ /* Goddard Space Flight Center. */ +// Foo foo + #include #include #include "fitsio2.h" From 1e53144deb51cbbb737ccae3e6e1b25d95b78af5 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 16:01:48 -0800 Subject: [PATCH 08/13] Update .gitattributes --- cextern/expat/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/cextern/expat/.gitattributes b/cextern/expat/.gitattributes index 1f24b48..d8e393b 100644 --- a/cextern/expat/.gitattributes +++ b/cextern/expat/.gitattributes @@ -1 +1,2 @@ *.cmake diff=cmakediff +win32/*.txt -diff From 7a3335d42a25640f386c1980307aba0b01b844f8 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 16:02:01 -0800 Subject: [PATCH 09/13] Update README.txt --- cextern/expat/win32/README.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cextern/expat/win32/README.txt b/cextern/expat/win32/README.txt index e3702ae..bcda8fc 100644 --- a/cextern/expat/win32/README.txt +++ b/cextern/expat/win32/README.txt @@ -1,3 +1,4 @@ +Gratuitous edit. Expat can be built on Windows in three ways: using MS Visual C++ (6.0 or .NET), Borland C++ Builder 5 or Cygwin. From 378e64d46ea4b4c763152b8a7e623e440cb096d3 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 16:04:16 -0800 Subject: [PATCH 10/13] Update .gitattributes --- cextern/expat/.gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cextern/expat/.gitattributes b/cextern/expat/.gitattributes index d8e393b..6e08214 100644 --- a/cextern/expat/.gitattributes +++ b/cextern/expat/.gitattributes @@ -1,2 +1,2 @@ *.cmake diff=cmakediff -win32/*.txt -diff +/win32/*.txt -diff From dc13ec438c6e8e782052c9ed32a0677cc572cdda Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 16:29:43 -0800 Subject: [PATCH 11/13] Update .gitattributes --- cextern/expat/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/cextern/expat/.gitattributes b/cextern/expat/.gitattributes index 6e08214..927172f 100644 --- a/cextern/expat/.gitattributes +++ b/cextern/expat/.gitattributes @@ -1,2 +1,3 @@ *.cmake diff=cmakediff /win32/*.txt -diff +*.in -diff From 14234ce15dcead3523ed8b1e3fe0926752c4b58e Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 16:29:59 -0800 Subject: [PATCH 12/13] Update Makefile.in --- cextern/expat/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cextern/expat/Makefile.in b/cextern/expat/Makefile.in index 9c0f5d4..558732f 100644 --- a/cextern/expat/Makefile.in +++ b/cextern/expat/Makefile.in @@ -18,6 +18,8 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. # +# Bogus + SHELL = @SHELL@ srcdir = @srcdir@ From 08139827575cf2e32c2ae4891eabb5517c4fd48a Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Mon, 5 Dec 2016 16:30:14 -0800 Subject: [PATCH 13/13] Update MANIFEST.in --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index d094a1a..8e68bf4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,8 @@ include README.rst include CHANGES.rst +# foo foobar + include ez_setup.py include ah_bootstrap.py include setup.cfg