version 2.4.0; update docs

pyproj4 · Sep 21, 2019 · a764f4a · a764f4a
1 parent 203fa2a
commit a764f4a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/docs/history.rst b/docs/history.rst
@@ -4,16 +4,17 @@ Change Log
 2.4.0
 ~~~~~
 * Minimum PROJ version is 6.2.0 (issue #411)
-* Remove global pyproj context (issue #418)
+* Removed global pyproj context (issue #418)
 * Added support for PROJ JSON in `pyproj.crs` objects and `pyproj.Transformer` (pull #432)
-* Move doctests code out of `pyproj.__init__` (issue #417)
+* Moved doctests code out of `pyproj.__init__` (issue #417)
 * Added version information to `python -m pyproj` (pull #429)
 * Added `scope` & `remarks` to `pyproj.crs` objects and `pyproj.Transformer` (issue #441)
 * Added `operations` to `pyproj.crs.CoordinateOperation` objects and `pyproj.Transformer` (issue #441)
 * Added :func:`~pyproj.get_authorities` and :func:`~pyproj.get_codes` (issue #440)
 * Release gil in core cython/PROJ code (issue #386)
-* BUG: Add checks for unititialized `pyproj.crs` objects to prevent core dumping (issue #433)
-* BUG: added fix for get_transform_crs when checking type (pull #439)
+* BUG: Added checks for unititialized `pyproj.crs` objects to prevent core dumping (issue #433)
+* BUG: Added fix for get_transform_crs when checking type (pull #439)
+* DOC: Build docs with python3 (pull #428)
 
 2.3.1
 ~~~~~

diff --git a/pyproj/__init__.py b/pyproj/__init__.py
@@ -47,7 +47,7 @@
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """
-__version__ = "2.4.rc1"
+__version__ = "2.4.0"
 __all__ = [
     "Proj",
     "Geod",

diff --git a/pyproj/crs.py b/pyproj/crs.py
@@ -438,7 +438,10 @@ def __init__(self, projparams=None, **kwargs):
 
     @classmethod
     def from_authority(cls, auth_name, code):
-        """Make a CRS from an authority name and authority code
+        """
+        .. versionadded:: 2.2.0
+        
+        Make a CRS from an authority name and authority code
 
         Parameters
         ----------
@@ -470,7 +473,10 @@ def from_epsg(cls, code):
 
     @classmethod
     def from_proj4(cls, in_proj_string):
-        """Make a CRS from a PROJ string
+        """
+        .. versionadded:: 2.2.0
+
+        Make a CRS from a PROJ string
 
         Parameters
         ----------
@@ -487,7 +493,10 @@ def from_proj4(cls, in_proj_string):
 
     @classmethod
     def from_wkt(cls, in_wkt_string):
-        """Make a CRS from a WKT string
+        """
+        .. versionadded:: 2.2.0
+
+        Make a CRS from a WKT string
 
         Parameters
         ----------
@@ -504,7 +513,8 @@ def from_wkt(cls, in_wkt_string):
 
     @classmethod
     def from_string(cls, in_crs_string):
-        """Make a CRS from:
+        """
+        Make a CRS from:
 
         Initialize a CRS class instance with:
          - PROJ string
@@ -524,7 +534,10 @@ def from_string(cls, in_crs_string):
         return cls(_prepare_from_string(in_crs_string))
 
     def to_string(self):
-        """Convert the CRS to a string.
+        """
+        .. versionadded:: 2.2.0
+
+        Convert the CRS to a string.
 
         It attempts to convert it to the authority string.
         Otherwise, it uses the string format of the user
@@ -585,7 +598,10 @@ def get_geod(self):
 
     @classmethod
     def from_dict(cls, proj_dict):
-        """Make a CRS from a dictionary of PROJ parameters.
+        """
+        .. versionadded:: 2.2.0
+
+        Make a CRS from a dictionary of PROJ parameters.
 
         Parameters
         ----------
@@ -601,10 +617,10 @@ def from_dict(cls, proj_dict):
     @classmethod
     def from_json(cls, crs_json):
         """
-        Create CRS from a CRS JSON string.
-
         .. versionadded:: 2.4.0
 
+        Create CRS from a CRS JSON string.
+
         Parameters
         ----------
         crs_json: str
@@ -619,10 +635,10 @@ def from_json(cls, crs_json):
     @classmethod
     def from_json_dict(cls, crs_dict):
         """
-        Create CRS from a JSON dictionary.
-
         .. versionadded:: 2.4.0
 
+        Create CRS from a JSON dictionary.
+
         Parameters
         ----------
         crs_dict: dict