increment to 1.3.5 to resolve platform-specific loading issue

hobuinc · May 16, 2017 · 759b3ab · 759b3ab
1 parent 921a662
commit 759b3ab
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/mgrs/__init__.py b/mgrs/__init__.py
@@ -3,7 +3,7 @@
 import ctypes
 import re
 
-__version__='1.3.4'
+__version__='1.3.5'
 
 class MGRS:
     def __init__(self):

diff --git a/mgrs/core.py b/mgrs/core.py
@@ -8,17 +8,26 @@ class RTreeError(Exception):
     "RTree exception, indicates a RTree-related error."
     pass
 
+
+def get_windows_platform_name():
+    libname = 'libmgrs'
+    try:
+        import wheel.pep425tags
+        name = wheel.pep425tags.get_abbr_impl() + \
+			   wheel.pep425tags.get_impl_ver() + \
+			   '-' + wheel.pep425tags.get_platform()
+        return libname + '.' + name + '.pyd'
+    except ImportError:
+        return libname + '.pyd'
+
 if os.name == 'nt':
     try:
         local_dlls = sys.path
         original_path = os.environ['PATH']
         os.environ['PATH'] = "%s;%s" % (';'.join(local_dlls), original_path)
-        try:
-            # Python 2
-            rt = ctypes.PyDLL('libmgrs.pyd')
-        except OSError:
-            # Python 3
-            rt = ctypes.PyDLL('libmgrs.cp35-win32.pyd')
+        # Python
+        platform = get_windows_platform_name()
+        rt = ctypes.PyDLL(platform)
         def free(m):
             try:
                 free = ctypes.cdll.msvcrt.free(m)

diff --git a/setup.py b/setup.py
@@ -1,11 +1,9 @@
 
 from glob import glob
-from setuptools import setup
+from setuptools import setup, Extension
 
 import os
 
-from setuptools import Extension
-
 sources = ['libmgrs/mgrs.c',
            'libmgrs/utm.c',
            'libmgrs/ups.c',
@@ -21,16 +19,13 @@
                  library_dirs = None
                  )
 
-# Get text from README.txt
-# readme_text = open('./README.rst', encoding='utf-8').read()
-
 import codecs
 
 with codecs.open('./README.rst', encoding="utf-8") as f:
     readme_text = f.read()
 
 setup(name          = 'mgrs',
-      version       = '1.3.4',
+      version       = '1.3.5',
       description   = 'MGRS coordinate conversion for Python',
       license       = 'MIT',
       keywords      = 'gis coordinate conversion',
@@ -42,9 +37,8 @@
       long_description = readme_text,
       ext_modules      = [mgrs],
       packages      = ['mgrs'],
-      install_requires = ['setuptools'],
+      install_requires = ['setuptools', 'wheel'],
       test_suite = 'tests.test_suite',
-      # data_files = data_files,
       zip_safe = False,
       classifiers   = [
         'Development Status :: 4 - Beta',