From 35376702215daf5d33235fc8661028b3df4f31c0 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Wed, 5 Sep 2018 22:31:01 +0200
Subject: [PATCH] 1.0.0-rc.2

---
 docs/changelog.md | 5 +++--
 setup.py          | 8 +++-----
 umap/__init__.py  | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index cdcbe2f3..104d8427 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -49,7 +49,7 @@ COMMIT;
         umap compress
 
 
-## dev
+## 1.0.0.rc-2
 
 - allow to cache proxied remote data requests (#513 #510 #160)
 - fixed popup template parsing of url with url as query string (#607)
@@ -57,8 +57,9 @@ COMMIT;
 - Removed Map.tilelayer foreignkey
 - split popupTemplate in popupShape and popupTemplate: popupShape is for
   choosing between proper popup and panel, while popupTemplate now will allow
-  to choose between default "name + description" mode, or table, or geoRss ones.
+  to choose between default "name + description" mode, or table, or geoRSS ones.
   Allows to add more of those in the future also.
+- fixed popup not opening on first zoom button click when marker is clustered (#611)
 
 ## 1.0.0.rc-1
 - BREAKING: support of python 2 is removed per upgrading to Django 2.0
diff --git a/setup.py b/setup.py
index 2c8e035b..dbb08bbc 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,17 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
-import codecs
 import io
+from pathlib import Path
 
 from setuptools import setup, find_packages
 
 import umap
 
-long_description = codecs.open('README.md', "r", "utf-8").read()
-
 
 def is_pkg(line):
     return line and not line.startswith(('--', 'git', '#'))
 
+
 with io.open('requirements.txt', encoding='utf-8') as reqs:
     install_requires = [l for l in reqs.read().split('\n') if is_pkg(l)]
 
@@ -29,7 +27,7 @@ setup(
     include_package_data=True,
     platforms=["any"],
     zip_safe=True,
-    long_description=long_description,
+    long_description=Path('README.md').read_text(),
     long_description_content_type='text/markdown',
     install_requires=install_requires,
     classifiers=[
diff --git a/umap/__init__.py b/umap/__init__.py
index 445a3f85..2918467c 100644
--- a/umap/__init__.py
+++ b/umap/__init__.py
@@ -1,5 +1,5 @@
 "Create maps with OpenStreetMap layers in a minute and embed them in your site."
-VERSION = (1, 0, 0, 'rc', 1)
+VERSION = (1, 0, 0, 'rc', 2)
 
 __author__ = 'Yohan Boniface'
 __contact__ = "ybon@openstreetmap.fr"