From 398b96a60232298891214fb49480c70149317d77 Mon Sep 17 00:00:00 2001
From: Matthew Daws <matt.daws@cantab.net>
Date: Fri, 15 Jan 2021 22:11:21 +0000
Subject: [PATCH] Next version released

---
 README.rst              | 14 +++++++-------
 changes                 | 14 ++++++++++++--
 setup.py                | 13 +++++--------
 tilemapbase/__init__.py |  2 +-
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/README.rst b/README.rst
index 1b174e8..b14b224 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@
 TileMapBase
 ===========
 
-Uses OpenStreetMap tiles, or other tile servers, to produce "basemaps"
+Uses OpenStreetMap tiles, or other tile servers, to produce “basemaps”
 for use with matplotlib. Uses a SQLite database to cache the tiles, so
 you can experiment with map production without re-downloading the same
 tiles. Supports Open Data tiles from the UK Ordnance Survey.
@@ -21,19 +21,19 @@ Install
 
 ::
 
-    pip install tilemapbase
+   pip install tilemapbase
 
 or build from source:
 
 ::
 
-    python setup.py install
+   python setup.py install
 
 or directly from GitHub:
 
 ::
 
-    pip install https://github.com/MatthewDaws/TileMapBase/zipball/master
+   pip install https://github.com/MatthewDaws/TileMapBase/zipball/master
 
 Example
 -------
@@ -49,7 +49,7 @@ Example
 OpenStreetMap data
 ------------------
 
-OpenStreetMap Data is "© OpenStreetMap contributors”, see
+OpenStreetMap Data is “© OpenStreetMap contributors”, see
 http://www.openstreetmap.org/copyright
 
 Please remember that tile set usage is subject to constraints:
@@ -57,8 +57,8 @@ https://operations.osmfoundation.org/policies/tiles/
 
 -  As of 25/05/2019 `OSM requires a user agent for all
    requests <https://operations.osmfoundation.org/policies/tiles/>`__,
-   with a warning "Faking another app’s User-Agent WILL get you
-   blocked." We hence default to using "TileMapBase" as a user agent.
+   with a warning “Faking another app’s User-Agent WILL get you
+   blocked.” We hence default to using “TileMapBase” as a user agent.
 
 Ordnance Survery data
 ---------------------
diff --git a/changes b/changes
index e84f356..db236b9 100644
--- a/changes
+++ b/changes
@@ -1,3 +1,9 @@
+# 0.4.7
+
+- Stop noisy logging, see https://github.com/MatthewDaws/TileMapBase/issues/13
+- Parse the new geoPandas CRS code, see https://github.com/MatthewDaws/TileMapBase/issues/19
+- Some error handling around lon/lat, see https://github.com/MatthewDaws/TileMapBase/issues/23
+
 # 0.4.6
 
 - Stop caching invalid responses from remote server: https://github.com/MatthewDaws/TileMapBase/pull/16
@@ -19,11 +25,15 @@
 - Add Extent static constructors from epsg:3857 coords
 - Work to allow uploading to PyPi:
     - Download and install `pandoc`
-    - `pip install pyandoc`
+    - `pip install pypandoc`
+    - Delete the `dist` directory
     - `python setup.py sdist`
     - `pip install twine`
+    -   The following assumes ".pypirc" has been written correctly (see https://packaging.python.org/specifications/pypirc/)
     - `twine upload --repository pypitest dist/*`
-    - Test: `pip install --index-url https://test.pypi.org/simple/ tilemapbase`
+    -   If you get an error, maybe I have already uploaded, and then deleted, the same version.  Try changing the version by adding letters.
+    - Test: ``
+    - More instructions here: https://packaging.python.org/tutorials/packaging-projects/
 
 # 0.4.2
 
diff --git a/setup.py b/setup.py
index b257a1d..3370a11 100644
--- a/setup.py
+++ b/setup.py
@@ -10,14 +10,11 @@ def find_version():
                 return line[start+1:][:end]
 
 try:
-    import pandoc
-    doc = pandoc.Document()
-    with open('readme.md', encoding='utf-8') as f:
-        doc.markdown = f.read().encode("utf-8")
-    with open("README.rst", "wb") as f:
-        f.write(doc.rst)
-except:
+    import pypandoc
+    pypandoc.convert_file("readme.md", "rst", outputfile="README.rst")
+except Exception as ex:
     print("NOT REFRESHING README.rst")
+    print("Exception was", ex)
 
 with open('README.rst', encoding='utf-8') as f:
     long_description = f.read()
@@ -27,7 +24,7 @@ def find_version():
     packages = ['tilemapbase'],
     version = find_version(),
     install_requires = ['requests', 'pillow'],
-    python_requires = '>=3.5',
+    python_requires = '>=3.6',
     description = 'Use OpenStreetMap tiles as basemaps in python / matplotlib',
     long_description = long_description,
     author = 'Matt Daws',
diff --git a/tilemapbase/__init__.py b/tilemapbase/__init__.py
index ea0d755..fd55a24 100644
--- a/tilemapbase/__init__.py
+++ b/tilemapbase/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 
 from .tiles import init, get_cache
 from .mapping import project, to_lonlat, Extent, Plotter, extent_from_frame