Skip to content

Commit

Permalink
Drop support for python 3.5 (#617)
Browse files Browse the repository at this point in the history
  • Loading branch information
snowman2 authored May 5, 2020
1 parent f30143b commit f315650
Show file tree
Hide file tree
Showing 27 changed files with 196 additions and 307 deletions.
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repos:
rev: 19.10b0
hooks:
- id: black
args: [--target-version, py36]
- repo: https://github.com/timothycrosley/isort
rev: 4.3.21
hooks:
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ matrix:
os: osx
env:
- PYTHON=3.6.8
- python: 3.5
- python: 3.6
- python: 3.6
env:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ check-type:
mypy pyproj

check: lint check-type ## flake8 black isort check
black --check setup.py pyproj/ test/ docs/
black --check --target-version py36 setup.py pyproj/ test/ docs/
isort --check --recursive setup.py pyproj/ test/ docs/

isort: ## order imports
isort --recursive setup.py pyproj/ test/ docs/

black: ## black format files
black setup.py pyproj/ test/ docs/
black --target-version py36 setup.py pyproj/ test/ docs/

test: ## run tests
py.test
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced_examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ transformations as well as missing transformations.
>>> from pyproj.transformer import TransformerGroup
>>> tg = TransformerGroup("epsg:4326", "+proj=aea +lat_0=50 +lon_0=-154 +lat_1=55 +lat_2=65 +x_0=0 +y_0=0 +datum=NAD27 +no_defs +type=crs +units=m", always_xy=True)
UserWarning: Best transformation is not available due to missing Grid(short_name=ntv2_0.gsb, full_name=, package_name=proj-datumgrid-north-america, url=https://download.osgeo.org/proj/proj-datumgrid-north-america-latest.zip, direct_download=True, open_license=True, available=False)
"{!r}".format(operation.grids[0])
f"{operation.grids[0]!r}"
>>> tg
<TransformerGroup: best_available=False>
- transformers: 37
Expand Down
12 changes: 6 additions & 6 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
master_doc = "index"

# General information about the project.
project = u"pyproj"
copyright = u"2006-2018, Jeffrey Whitaker; 2019-2020, Open source contributors"
author = u"Jeffrey Whitaker"
project = "pyproj"
copyright = "2006-2018, Jeffrey Whitaker; 2019-2020, Open source contributors"
author = "Jeffrey Whitaker"

# The version info for the project you're documenting, acts as replacement
# for |version| and |release|, also used in various other places throughout
Expand Down Expand Up @@ -131,15 +131,15 @@
# (source start file, target name, title, author, documentclass
# [howto, manual, or own class]).
latex_documents = [
(master_doc, "pyproj.tex", u"pyproj Documentation", u"Delta", "manual")
(master_doc, "pyproj.tex", "pyproj Documentation", "Delta", "manual")
]


# -- Options for manual page output ------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [(master_doc, "pyproj", u"pyproj Documentation", [author], 1)]
man_pages = [(master_doc, "pyproj", "pyproj Documentation", [author], 1)]


# -- Options for Texinfo output ----------------------------------------
Expand All @@ -151,7 +151,7 @@
(
master_doc,
"pyproj",
u"pyproj Documentation",
"pyproj Documentation",
author,
"pyproj",
"One line description of project.",
Expand Down
8 changes: 4 additions & 4 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ Calculate the geodesic length of a line (See: :meth:`pyproj.Geod.line_length`):
... 88, 59, 25, -4, -14, -33, -46, -61]
>>> geod = Geod(ellps="WGS84")
>>> total_length = geod.line_length(lons, lats)
>>> "{:.3f}".format(total_length)
>>> f"{total_length:.3f}"
'14259605.611'
Calculate the geodesic length of a shapely geometry (See: :meth:`pyproj.Geod.geometry_length`):
Expand All @@ -414,7 +414,7 @@ Calculate the geodesic length of a shapely geometry (See: :meth:`pyproj.Geod.geo
>>> line_string = LineString([Point(1, 2), Point(3, 4)]))
>>> geod = Geod(ellps="WGS84")
>>> total_length = geod.geometry_length(line_string)
>>> "{:.3f}".format(total_length)
>>> f"{total_length:.3f}"
'313588.397'
Expand All @@ -432,7 +432,7 @@ Calculate the geodesic area and perimeter of a polygon (See: :meth:`pyproj.Geod.
>>> lons = [-74, -102, -102, -131, -163, 163, 172, 140, 113,
... 88, 59, 25, -4, -14, -33, -46, -61]
>>> poly_area, poly_perimeter = geod.polygon_area_perimeter(lons, lats)
>>> "{:.3f} {:.3f}".format(poly_area, poly_perimeter)
>>> f"{poly_area:.3f} {poly_perimeter:.3f}"
'13376856682207.406 14710425.407'
Expand All @@ -450,5 +450,5 @@ Calculate the geodesic area and perimeter of a shapely polygon (See: :meth:`pypr
holes=[LineString([Point(1, 2), Point(3, 4), Point(5, 2)])],
)
)
>>> "{:.3f} {:.3f}".format(poly_area, poly_perimeter)
>>> f"{poly_area:.3f} {poly_perimeter:.3f}"
'-944373881400.339 3979008.036'
4 changes: 4 additions & 0 deletions docs/history.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Change Log
==========

3.0.0
-----
* Minimum supported Python version 3.6 (issue #499)

2.6.1
~~~~~
* WHL: Wheels contain PROJ version is 7.0.1
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Python interface to `PROJ <https://proj.org/>`_ (cartographic projections and c

.. note:: Minimum supported PROJ version is 6.2.0

.. note:: Minimum supported Python version is 3.5
.. note:: Minimum supported Python version is 3.6

GitHub Repository: https://github.com/pyproj4/pyproj

Expand Down
2 changes: 1 addition & 1 deletion pyproj/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Download: http://python.org/pypi/pyproj
Requirements: Python 3.5+.
Requirements: Python 3.6+.
Contact: Jeffrey Whitaker <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion pyproj/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
if args.verbose:
_show_versions.show_versions()
else:
print("pyproj version: {} [PROJ version: {}]".format(__version__, __proj_version__))
print(f"pyproj version: {__version__} [PROJ version: {__proj_version__}]")
parser.print_help()
Loading

0 comments on commit f315650

Please sign in to comment.