Skip to content

Commit 26fea57

Browse files
snowman2snowman2
authored
Updated license & copyright information (#578)
1 parent 6fed9a9 commit 26fea57

File tree

16 files changed

+79
-142
lines changed

16 files changed

+79
-142
lines changed

‎LICENSE‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
Contact: Jeffrey Whitaker <[email protected]
1+
Copyright (c) 2006-2018, Jeffrey Whitaker.
2+
Copyright (c) 2019-2020, Open source contributors.
23

3-
copyright (c) 2013 by Jeffrey Whitaker.
4+
Permission is hereby granted, free of charge, to any person obtaining a copy of
5+
this software and associated documentation files (the "Software"), to deal in
6+
the Software without restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
8+
Software, and to permit persons to whom the Software is furnished to do so,
9+
subject to the following conditions:
410

5-
Permission to use, copy, modify, and distribute this software
6-
and its documentation for any purpose and without fee is hereby
7-
granted, provided that the above copyright notice appear in all
8-
copies and that both the copyright notice and this permission
9-
notice appear in supporting documentation. THE AUTHOR DISCLAIMS
10-
ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
11-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
12-
SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
13-
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
14-
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
15-
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
16-
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
11+
The above copyright notice and this permission notice shall be included in all
12+
copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
15+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
16+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
17+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
18+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
19+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎docs/conf.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
# -*- coding: utf-8 -*-
32
#
43
# pyproj documentation build configuration file, created by
54
# sphinx-quickstart on Fri Jun 9 13:47:02 2017.
@@ -55,7 +54,7 @@
5554

5655
# General information about the project.
5756
project = u"pyproj"
58-
copyright = u"2019, Jeffrey Whitaker"
57+
copyright = u"2006-2018, Jeffrey Whitaker; 2019-2020, Open source contributors"
5958
author = u"Jeffrey Whitaker"
6059

6160
# The version info for the project you're documenting, acts as replacement

‎pyproj/__init__.py‎

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,33 @@
1-
# -*- coding: utf-8 -*-
21
"""
3-
Cython wrapper to provide python interfaces to
4-
PROJ (https://proj.org) functions.
5-
6-
Performs cartographic transformations and geodetic computations.
7-
8-
The Proj class can convert from geographic (longitude,latitude)
9-
to native map projection (x,y) coordinates and vice versa, or
10-
from one map projection coordinate system directly to another.
11-
The module variable pj_list is a dictionary containing all the
12-
available projections and their descriptions.
13-
14-
The Geod class can perform forward and inverse geodetic, or
15-
Great Circle, computations. The forward computation involves
16-
determining latitude, longitude and back azimuth of a terminus
17-
point given the latitude and longitude of an initial point, plus
18-
azimuth and distance. The inverse computation involves
19-
determining the forward and back azimuths and distance given the
20-
latitudes and longitudes of an initial and terminus point.
21-
22-
Input coordinates can be given as python arrays, lists/tuples,
23-
scalars or numpy/Numeric/numarray arrays. Optimized for objects
24-
that support the Python buffer protocol (regular python and
25-
numpy array objects).
2+
Python interface to PROJ (https://proj.org),
3+
cartographic projections and coordinate transformations library.
264
275
Download: http://python.org/pypi/pyproj
286
297
Requirements: Python 3.5+.
308
31-
Example scripts are in 'test' subdirectory of source distribution.
32-
The 'test()' function will run the examples in the docstrings.
9+
Contact: Jeffrey Whitaker <[email protected]>
10+
11+
Copyright (c) 2006-2018, Jeffrey Whitaker.
12+
Copyright (c) 2019-2020, Open source contributors.
3313
34-
Contact: Jeffrey Whitaker <[email protected]
14+
Permission is hereby granted, free of charge, to any person obtaining a copy of
15+
this software and associated documentation files (the "Software"), to deal in
16+
the Software without restriction, including without limitation the rights to use,
17+
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
18+
Software, and to permit persons to whom the Software is furnished to do so,
19+
subject to the following conditions:
3520
36-
copyright (c) 2006 by Jeffrey Whitaker.
21+
The above copyright notice and this permission notice shall be included in all
22+
copies or substantial portions of the Software.
3723
38-
Permission to use, copy, modify, and distribute this software
39-
and its documentation for any purpose and without fee is hereby
40-
granted, provided that the above copyright notice appear in all
41-
copies and that both the copyright notice and this permission
42-
notice appear in supporting documentation. THE AUTHOR DISCLAIMS
43-
ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
44-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
45-
SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
46-
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
47-
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
48-
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
49-
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
25+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
26+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
27+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
28+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
29+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30+
"""
5031
__version__ = "2.6.0rc0"
5132
__all__ = [
5233
"Proj",

‎pyproj/compat.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# -*- coding: utf-8 -*-
1+
"""
2+
This module is for compatibility between string types
3+
"""
24

35

46
def cstrencode(pystr):

‎pyproj/crs/__init__.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
This module interfaces with PROJ to produce a pythonic interface
43
to the coordinate reference system (CRS) information through the CRS
54
class.
6-
7-
Original Author: Alan D. Snow [github.com/snowman2] (2019)
85
"""
96

107
from pyproj._crs import ( # noqa: F401

‎pyproj/crs/coordinate_operation.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
"""
2+
This module is for building operations to be used when
3+
building a CRS.
4+
5+
https://proj.org/operations/
6+
"""
17
import warnings
28
from distutils.version import LooseVersion
39
from typing import Any

‎pyproj/crs/coordinate_system.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
"""
2+
This module is for building coordinate systems to be used when
3+
building a CRS.
4+
"""
15
from typing import Union
26

37
from pyproj._crs import CoordinateSystem

‎pyproj/crs/crs.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
This module interfaces with PROJ to produce a pythonic interface
43
to the coordinate reference system (CRS) information.
5-
6-
Original Author: Alan D. Snow [github.com/snowman2] (2019)
7-
84
"""
95
import json
106
import re

‎pyproj/crs/datum.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
"""
2+
This module is for building datums to be used when
3+
building a CRS.
4+
"""
15
from typing import Any, Dict, Optional, Union
26

37
from pyproj._crs import Datum, Ellipsoid, PrimeMeridian

‎pyproj/datadir.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Set the datadir path to the local data directory
2+
Module for managing the PROJ data directory.
33
"""
44
import os
55
import sys

0 commit comments

Comments
 (0)