diff --git a/pyproj-1.9.4.tar.gz b/pyproj-1.9.4.tar.gz deleted file mode 100644 index 17caded..0000000 --- a/pyproj-1.9.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71b4d8c52d781e2b4afe2d3609e9d700cb631ddbf51060bc702644733cc70869 -size 7838454 diff --git a/pyproj-1.9.5.1.tar.gz b/pyproj-1.9.5.1.tar.gz new file mode 100644 index 0000000..560e1d7 --- /dev/null +++ b/pyproj-1.9.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8 +size 4424543 diff --git a/python-pyproj.changes b/python-pyproj.changes index 3006b93..2f7ef0a 100644 --- a/python-pyproj.changes +++ b/python-pyproj.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue May 15 14:01:20 UTC 2018 - bruno@ioda-net.ch + +- Packaging : + + move to python singlespec + + use %check and run unit tests for version >= 1500 + + spec-cleaner (date/license) +- update upstream release 1.9.5.1 + * fix for issue #42 compilation error with microsoft visual studio + + 1.9.5 + * update proj4 source to latest github master commit 953cc00f + * port of basemap fix for input arrays in fortran order + * restore inverse Hammer patch that was lost when proj4 source + code was updated. + ------------------------------------------------------------------- Fri Oct 23 17:11:32 UTC 2015 - bruno@ioda-net.ch diff --git a/python-pyproj.spec b/python-pyproj.spec index 97a00a1..f84ce89 100644 --- a/python-pyproj.spec +++ b/python-pyproj.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyproj # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,34 @@ # -%define pyname pyproj -Name: python-%{pyname} -Version: 1.9.4 +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +Name: python-pyproj +Version: 1.9.5.1 Release: 0 -Summary: Python interface to PROJ.4 library -License: SUSE-Public-Domain and X11 -Group: Productivity/Scientific/Other -Url: http://pypi.python.org/pypi/pyproj/ -Source: https://pypi.python.org/packages/source/p/pyproj/%{pyname}-%{version}.tar.gz +Summary: Python interface to PROJ4 library +License: SUSE-Public-Domain AND X11 +Group: Development/Languages/Python +URL: https://github.com/jswhit/pyproj +Source: https://files.pythonhosted.org/packages/source/p/pyproj/pyproj-%{version}.tar.gz +# TODO : test it with external proj +# Do tests only for > 1500 +%if 0%{suse_version} >= 1500 +BuildRequires: %{python_module cov-core} +BuildRequires: %{python_module coverage} >= 4.0 +BuildRequires: %{python_module nose2} +%endif +BuildRequires: %{python_module Cython} >= 0.23.5 +BuildRequires: %{python_module devel} +BuildRequires: %{python_module numpy} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: python-devel +BuildRequires: python-rpm-macros Requires: python-numpy -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%py_requires +%python_subpackages %description Performs cartographic transformations and geodetic computations. + The Proj class can convert from geographic (longitude,latitude) to native map projection (x,y) coordinates and vice versa, or from one map projection coordinate system directly to another. @@ -48,24 +59,35 @@ Input coordinates can be given as python arrays, lists/tuples, scalars or numpy/Numeric/numarray arrays. Optimized for objects that support the Python buffer protocol (regular python and numpy array objects). +This project has a git repository https://github.com/jswhit/pyproj +where you may access the most up-to-date source. + %prep -%setup -q -n %{pyname}-%{version} +%setup -q -n pyproj-%{version} %build -python setup.py build +%python_build %install - -python setup.py install --prefix=%{_prefix} --root=%{buildroot} \ - --record-rpm=INSTALLED_FILES - -%fdupes -s %{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} +%python_expand chmod -x %{buildroot}%{$python_sitearch}/pyproj/data/test* %check -#python -c "import pyproj; pyproj.test()" +%if 0%{suse_version} >= 1500 -%files -f INSTALLED_FILES -%defattr(-,root,root,-) -%doc README.md LICENSE LICENSE_proj4 Changelog docs/* +%{python_expand # Multiline +export PYTHONPATH=%{buildroot}%{$python_sitearch} +$python -c "import pyproj; pyproj.test()" +$python -c "import pyproj; pyproj.Proj(init='epsg:4269')" +$python unittest/test.py -v +} + +%endif + +%files %{python_files} +%license LICENSE LICENSE_proj4 +%doc README.md Changelog docs/* +%{python_sitearch}/* %changelog diff --git a/python3-pyproj.changes b/python3-pyproj.changes deleted file mode 100644 index 3006b93..0000000 --- a/python3-pyproj.changes +++ /dev/null @@ -1,39 +0,0 @@ -------------------------------------------------------------------- -Fri Oct 23 17:11:32 UTC 2015 - bruno@ioda-net.ch - -- Packaging : merged package to python-pyproj src in App:Geo - -------------------------------------------------------------------- -Wed Oct 21 15:03:01 UTC 2015 - bruno@ioda-net.ch - -- update upstream release 1.9.4 - + 1.9.4 (git tag v1.9.4rel) - * migrate to github from googlecode. - * update proj4 source code from svn r2595 (version 4.9.0RC2). - * include runtime_library_dirs in setup-proj.py. - * added to_latlong method (issue 51). - * fix back azimuth when lon1 and lon2 are identical. - + 1.9.3 (svn revision 327) - * Geod now uses C code adapted from geographiclib now included - in proj4 source, instead of pure python code directly from - geographiclib. - * make radians=True work with Geod.npts (issue 47). - * allow PROJ_DIR env var to control location of proj data - (issue 40). - + 1.9.2 (svn revision 301) - * updated proj4 src to 4.8.0 - includes two new map - projections (natearth and isea). - + 1.9.1 (svn revision 285) - * restore compatibility with python 2.4/2.5, which was broken - by the addition of the geographiclib geodesic - module (issue 36). - -- packaging - + create equivalent python3 package - + cleanup spec format - -------------------------------------------------------------------- -Sat Feb 11 22:22:02 UTC 2012 - ocefpaf@gmail.com - -- first openSuse release 1.9.0 - diff --git a/python3-pyproj.spec b/python3-pyproj.spec deleted file mode 100644 index 764804e..0000000 --- a/python3-pyproj.spec +++ /dev/null @@ -1,71 +0,0 @@ -# -# spec file for package python-pyproj -# -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define pyname pyproj -Name: python3-%{pyname} -Version: 1.9.4 -Release: 0 -Summary: Python interface to PROJ.4 library -License: SUSE-Public-Domain and X11 -Group: Productivity/Scientific/Other -Url: http://pypi.python.org/pypi/pyproj/ -Source: https://pypi.python.org/packages/source/p/pyproj/%{pyname}-%{version}.tar.gz -BuildRequires: fdupes -BuildRequires: python3-devel -Requires: python3 -Requires: python3-numpy -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Performs cartographic transformations and geodetic computations. -The Proj class can convert from geographic (longitude,latitude) to native map -projection (x,y) coordinates and vice versa, or from one map projection -coordinate system directly to another. - -The Geod class can perform forward and inverse geodetic, or Great Circle, -computations. The forward computation involves determining latitude, longitude -and back azimuth of a terminus point given the latitude and longitude of an -initial point, plus azimuth and distance. The inverse computation involves -determining the forward and back azimuths and distance given the latitudes and -longitudes of an initial and terminus point. - -Input coordinates can be given as python arrays, lists/tuples, scalars or -numpy/Numeric/numarray arrays. Optimized for objects that support the Python -buffer protocol (regular python and numpy array objects). - -%prep -%setup -q -n %{pyname}-%{version} - -%build -python3 setup.py build - -%install - -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} \ - --record-rpm=INSTALLED_FILES - -%fdupes -s %{buildroot} - -%check -#python3 -c "import pyproj; pyproj.test()" - -%files -f INSTALLED_FILES -%defattr(-,root,root,-) -%doc README.md LICENSE LICENSE_proj4 Changelog docs/* - -%changelog