diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2fc6bf545..7c8ae16ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -200,7 +200,7 @@ running both the unit tests as well as the `flake8` code linter. ### Merging Once we're all happy with the pull request, it's time for it to get merged in. Only the -maintainers can merge pull requests and you should never merge a pull request you have commits on as it circumvents the code review. If this is your first or second pull request, we'll likely help by rebasing and cleaning up the commit history for you. As your developement skills increase, we'll help you learn how to do this. +maintainers can merge pull requests and you should never merge a pull request you have commits on as it circumvents the code review. If this is your first or second pull request, we'll likely help by rebasing and cleaning up the commit history for you. As your development skills increase, we'll help you learn how to do this. ## Allcontributors Recognition @@ -213,7 +213,7 @@ other ways, feel free to contact us: * [pyproj's Gitter Channel](https://gitter.im/pyproj4-pyproj/community) * ["pyproj" tag on GIS Stack Exchange](https://gis.stackexchange.com/questions/tagged/pyproj) -## Futher Reading +## Further Reading There are a ton of great resources out there on contributing to open source and on the importance of writing tested and maintainable software. * [GitHub's Contributing to Open Source Guide](https://guides.github.com/activities/contributing-to-open-source/) diff --git a/HOW_TO_RELEASE.md b/HOW_TO_RELEASE.md index 2556f96b7..9dd6b7f6b 100644 --- a/HOW_TO_RELEASE.md +++ b/HOW_TO_RELEASE.md @@ -21,7 +21,7 @@ The next step is to create a tag with the same name as the version just added. T 1. Create a draft PR at https://github.com/pyproj4/pyproj-wheels and verify tests pass. 2. Create a draft PR at https://github.com/conda-forge/pyproj-feedstock and verify tests pass. 3. Check the wheels built at https://github.com/pyproj4/pyproj using GitHub Actions. -4. Verify Debian builds were succesful. +4. Verify Debian builds were successful. 5. Verify the docs build successfully. ## Phase 2: Make the release diff --git a/docs/advanced_examples.rst b/docs/advanced_examples.rst index 6d24ea0dd..987acf558 100644 --- a/docs/advanced_examples.rst +++ b/docs/advanced_examples.rst @@ -137,7 +137,7 @@ Promote CRS to 3D .. versionadded:: 3.1 -In PROJ 6+ you neeed to explictly change your CRS to 3D if you have +In PROJ 6+ you need to explicitly change your CRS to 3D if you have 2D CRS and you want the ellipsoidal height taken into account. diff --git a/docs/examples.rst b/docs/examples.rst index 4c758e60f..4dabace21 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -373,7 +373,7 @@ Step 2: Create Transformer to convert from geodetic CRS to CRS ---------------------------- .. note:: If you are doing a transformation with a CRS that is time based, - it is recommended to include the time in the transformaton operation. + it is recommended to include the time in the transformation operation. .. code:: python diff --git a/docs/gotchas.rst b/docs/gotchas.rst index 7a7417205..b3e8bb29a 100644 --- a/docs/gotchas.rst +++ b/docs/gotchas.rst @@ -199,7 +199,7 @@ is in the **axis order**. The reason the `min_confidence` parameter in :meth:`pyproj.crs.CRS.to_epsg` and :meth:`pyproj.crs.CRS.to_authority` exists is because you can initialize a CRS in several different methods and -some of them do not always coorespond to an EPSG or authortiy code, but it +some of them do not always correspond to an EPSG or authortiy code, but it can be close enough. For example, if you have a WKT/PROJ string and you use it to create the CRS instance, diff --git a/docs/history.rst b/docs/history.rst index 898e6737b..aacb49268 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -196,7 +196,7 @@ Latest * 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: Added checks for unititialized `pyproj.crs` objects to prevent core dumping (issue #433) +* BUG: Added checks for uninitialized `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) @@ -245,7 +245,7 @@ Latest * Added fix for whitepace around '=' in PROJ strings (issue #345) * Update version check in `setup.py` (issue #323) * Add "stable" doc site pointing to latest release (issue #347, pull #348) -* Depreate `Proj.proj_version` (pull #337) +* Deprecate `Proj.proj_version` (pull #337) * Test fixes (pull #333, pull #335) 2.2.0 @@ -253,9 +253,9 @@ Latest * Minimum PROJ version is now 6.1.0 * `pyproj.crs` updates: * Updated CRS repr (issue #264) - * Add Datum, CoordinateSystem, CoordinateOperation clases (issue #262) + * Add Datum, CoordinateSystem, CoordinateOperation classes, (issue #262) * Added :meth:`pyproj.crs.CRS.to_cf` and :meth:`pyproj.crs.CRS.from_cf` for - converting to/from Climate and Forcast (CF) 1.8 grid mappings (pull #244) + converting to/from Climate and Forecast (CF) 1.8 grid mappings (pull #244) * Added :meth:`pyproj.crs.CRS.to_dict` (issue #226) * Added :meth:`pyproj.crs.CRS.to_authority` (pull #294) * Added :attr:`pyproj.crs.CRS.is_vertical` and :attr:`pyproj.crs.CRS.is_engineering` (issue #316) diff --git a/pyproj/_crs.pyx b/pyproj/_crs.pyx index fcc578564..ce11614e6 100644 --- a/pyproj/_crs.pyx +++ b/pyproj/_crs.pyx @@ -2941,7 +2941,7 @@ cdef class _CRS(Base): This method will check for a property on the CRS. It will check if it has the property on the sub CRS - if it is a compount CRS and will check if the source CRS + if it is a compound CRS and will check if the source CRS has the property if it is a bound CRS. Parameters @@ -2975,7 +2975,7 @@ cdef class _CRS(Base): """ This checks if the CRS is geographic. It will check if it has a geographic CRS - in the sub CRS if it is a compount CRS and will check if + in the sub CRS if it is a compound CRS and will check if the source CRS is geographic if it is a bound CRS. Returns @@ -2997,7 +2997,7 @@ cdef class _CRS(Base): """ This checks if the CRS is projected. It will check if it has a projected CRS - in the sub CRS if it is a compount CRS and will check if + in the sub CRS if it is a compound CRS and will check if the source CRS is projected if it is a bound CRS. Returns @@ -3017,7 +3017,7 @@ cdef class _CRS(Base): This checks if the CRS is vertical. It will check if it has a vertical CRS - in the sub CRS if it is a compount CRS and will check if + in the sub CRS if it is a compound CRS and will check if the source CRS is vertical if it is a bound CRS. Returns diff --git a/pyproj/crs/_cf1x8.py b/pyproj/crs/_cf1x8.py index d8dd2b8c6..2588be23e 100644 --- a/pyproj/crs/_cf1x8.py +++ b/pyproj/crs/_cf1x8.py @@ -414,7 +414,7 @@ def _geostationary__to_cf(conversion): "grid_mapping_name": "geostationary", "sweep_angle_axis": sweep_angle_axis, "perspective_point_height": params["satellite_height"], - # geostationary satellites orbit arount equator + # geostationary satellites orbit around equator # so latitude_of_natural_origin is often left off and assumed to be 0.0 "latitude_of_projection_origin": params.get("latitude_of_natural_origin", 0.0), "longitude_of_projection_origin": params["longitude_of_natural_origin"], diff --git a/pyproj/crs/crs.py b/pyproj/crs/crs.py index e0774b6d3..c78589bbe 100644 --- a/pyproj/crs/crs.py +++ b/pyproj/crs/crs.py @@ -1443,7 +1443,7 @@ def is_geographic(self) -> bool: """ This checks if the CRS is geographic. It will check if it has a geographic CRS - in the sub CRS if it is a compount CRS and will check if + in the sub CRS if it is a compound CRS and will check if the source CRS is geographic if it is a bound CRS. Returns @@ -1458,7 +1458,7 @@ def is_projected(self) -> bool: """ This checks if the CRS is projected. It will check if it has a projected CRS - in the sub CRS if it is a compount CRS and will check if + in the sub CRS if it is a compound CRS and will check if the source CRS is projected if it is a bound CRS. Returns @@ -1475,7 +1475,7 @@ def is_vertical(self) -> bool: This checks if the CRS is vertical. It will check if it has a vertical CRS - in the sub CRS if it is a compount CRS and will check if + in the sub CRS if it is a compound CRS and will check if the source CRS is vertical if it is a bound CRS. Returns diff --git a/pyproj/exceptions.py b/pyproj/exceptions.py index 906435407..4605ff044 100644 --- a/pyproj/exceptions.py +++ b/pyproj/exceptions.py @@ -19,7 +19,7 @@ def __init__(self, error_message: str) -> None: @staticmethod def clear() -> None: """ - This will clear the internal PROJ erro message. + This will clear the internal PROJ error message. """ ProjError.internal_proj_error = None diff --git a/pyproj/network.py b/pyproj/network.py index f25a34b45..f35f792f3 100644 --- a/pyproj/network.py +++ b/pyproj/network.py @@ -35,7 +35,7 @@ def set_ca_bundle_path(ca_bundle_path: Union[Path, str, bool, None] = None) -> N Default is None, which only uses the `certifi` package path as a fallback if the environment variables are not set. If a path is passed in, then that will be the path used. If it is set to True, then it will default - to using the path provied by the `certifi` package. If it is set to False + to using the path provided, by the `certifi` package. If it is set to False or an empty string then it will default to the system settings or environment variables. """ diff --git a/pyproj/transformer.py b/pyproj/transformer.py index f1ebdb4f9..2d3d18f12 100644 --- a/pyproj/transformer.py +++ b/pyproj/transformer.py @@ -619,7 +619,7 @@ def from_pipeline(proj_pipeline: str) -> "Transformer": - :c:func:`proj_create` - :c:func:`proj_create_from_database` - .. versionadded:: 3.1.0 AUTH:CODE string suppor (e.g. EPSG:1671) + .. versionadded:: 3.1.0 AUTH:CODE string support (e.g. EPSG:1671) Allowed input: - a PROJ string diff --git a/pyproj/utils.py b/pyproj/utils.py index 2029db6d3..c355273de 100644 --- a/pyproj/utils.py +++ b/pyproj/utils.py @@ -100,7 +100,7 @@ def _copytobuffer(xxx: Any, inplace: bool = False) -> Tuple[Any, DataType]: A scalar, list, tuple, numpy.array, pandas.Series, xaray.DataArray, or dask.array.Array. inplace: bool, default=False - If True, will return the array withour a copy if it + If True, will return the array without a copy if it meets the requirements of the Python Buffer API & PROJ C-API. Returns diff --git a/test/crs/test_crs.py b/test/crs/test_crs.py index 0c3018e15..c086e3aca 100644 --- a/test/crs/test_crs.py +++ b/test/crs/test_crs.py @@ -394,7 +394,7 @@ def test_crs_OSR_equivalence(): with pytest.warns(FutureWarning): crs3 = CRS({"init": "EPSG:4326"}) assert crs1 == crs2 - # these are not equivalent in proj.4 now as one uses degrees and the othe radians + # these are not equivalent in proj.4 now as one uses degrees and the other radians assert crs1 == crs3 diff --git a/test/test_geod.py b/test/test_geod.py index cf2dbf5af..d4b5ee327 100644 --- a/test/test_geod.py +++ b/test/test_geod.py @@ -117,7 +117,7 @@ def test_geod_inverse_transform(): npts1 = npts + initial_idx + terminus_idx - 1 del_s = dist / npts1 print( - f"Total distnace is {dist}, " + f"Total distance is {dist}, " f"Points count: {npts}, " f"{inc_exc[include_initial]} initial point, " f"{inc_exc[include_terminus]} terminus point. " diff --git a/test/test_transformer.py b/test/test_transformer.py index 90f789af8..753842e14 100644 --- a/test/test_transformer.py +++ b/test/test_transformer.py @@ -654,7 +654,7 @@ def test_transform_group__missing_best(): assert "ntv2_0" not in trans_group.transformers[0].definition assert "ntv2_0" in trans_group.unavailable_operations[0].to_proj4() else: - # assuming all grids avaiable or PROJ_NETWORK=ON + # assuming all grids available or PROJ_NETWORK=ON trans_group = pyproj.transformer.TransformerGroup( lat_lon_proj.crs, alaska_aea_proj.crs )