From ab483ec69a9635e99f991a7fee3c4ba182c0adb6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Dec 2016 10:39:10 -0700 Subject: [PATCH] Update to 1.3rc1 --- .gitignore | 1 + ...3d2b1fb4c897fecedda563fb396d7c1bc6ec.patch | 26 ------------------- python-astropy.spec | 15 +++++------ sources | 2 +- 4 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 2b363d2b1fb4c897fecedda563fb396d7c1bc6ec.patch diff --git a/.gitignore b/.gitignore index 2b5f8e2..710f54c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /astropy-1.1.1.tar.gz /astropy-1.1.2.tar.gz /astropy-1.2.1.tar.gz +/astropy-1.3rc1.tar.gz diff --git a/2b363d2b1fb4c897fecedda563fb396d7c1bc6ec.patch b/2b363d2b1fb4c897fecedda563fb396d7c1bc6ec.patch deleted file mode 100644 index 37ad7ff..0000000 --- a/2b363d2b1fb4c897fecedda563fb396d7c1bc6ec.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 886bcb218e71ae95a63947ee95c0dc1bb0946750 Mon Sep 17 00:00:00 2001 -From: Ze Vinicius -Date: Thu, 28 Jul 2016 06:42:11 -0300 -Subject: [PATCH] fixes test circmean against scipy - ---- - astropy/stats/tests/test_circstats.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/astropy/stats/tests/test_circstats.py b/astropy/stats/tests/test_circstats.py -index c1c3c06..b30b074 100644 ---- a/astropy/stats/tests/test_circstats.py -+++ b/astropy/stats/tests/test_circstats.py -@@ -40,8 +40,10 @@ def test_circmean(): - @pytest.mark.skipif('not HAS_SCIPY') - def test_circmean_against_scipy(): - # testing against scipy.stats.circmean function -- data = np.random.uniform(-np.pi, np.pi, size=(100, 5)) -- answer = scipy.stats.circmean(data, np.pi, -np.pi) -+ # the data is the same as the test before, but in radians -+ data = np.array([0.89011792, 1.1693706, 0.6981317, 1.90240888, 0.54105207, -+ 6.24827872]) -+ answer = scipy.stats.circmean(data) - assert_equal(np.around(answer, 2), np.around(circmean(data), 2)) - - diff --git a/python-astropy.spec b/python-astropy.spec index 9fa4337..4e9c0ff 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -20,21 +20,18 @@ %global srcname astropy Name: python-astropy -Version: 1.2.1 -Release: 6%{?dist} +Version: 1.3 +Release: 0.1.rc1%{?dist} Summary: A Community Python Library for Astronomy License: BSD URL: http://astropy.org -Source0: https://pypi.io/packages/source/a/astropy/astropy-%{version}.tar.gz +Source0: https://pypi.io/packages/source/a/astropy/astropy-%{version}rc1.tar.gz Source1: astropy-README.dist Source2: astropy-ply.py Patch0: python-astropy-system-configobj.patch Patch1: python-astropy-system-pytest.patch Patch2: python-astropy-system-six.patch -# Fix problem with test 'test_circmean_against_scipy' -# https://github.com/astropy/astropy/pull/5203 -Patch3: https://github.com/astropy/astropy/commit/2b363d2b1fb4c897fecedda563fb396d7c1bc6ec.patch BuildRequires: git BuildRequires: cfitsio-devel @@ -172,7 +169,7 @@ Requires: python-%{srcname} = %{version}-%{release} Utilities provided by Astropy %prep -%setup -qn %{srcname}-%{version} +%setup -qn %{srcname}-%{version}rc1 cp %{SOURCE1} README.dist # Required to support wcslib 4.5 find -name wcsconfig.h -delete @@ -185,7 +182,6 @@ rm -rf astropy*egg-info %patch2 -p1 # Use system ply cp %{SOURCE2} astropy/extern/ply.py -%patch3 -p1 # Remove expat, erfa, cfitsio and wcslib rm -rf cextern/cfitsio @@ -282,6 +278,9 @@ popd %endif # with_python3 %changelog +* Wed Dec 21 2016 Orion Poplawski - 1.3-0.1.rc1 +- Update to 1.3rc1 + * Mon Dec 19 2016 Miro HronĨok - 1.2.1-6 - Rebuild for Python 3.6 diff --git a/sources b/sources index c4f0a8a..2cc63ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3399f67897cdb75e0efa56c463b0497 astropy-1.2.1.tar.gz +SHA512 (astropy-1.3rc1.tar.gz) = cd175ca0d2bf1ca1d2dcbda1bf44921b945bc96a6f602b650b6cbbf5ef7a98283c518e5dc54d3bb74f84ae431ca90d19df6130b43d43d16f54e5b980feafbef1