yamlscript 0.2.18__tar.gz → 0.2.20__tar.gz

{yamlscript-0.2.18/lib/yamlscript.egg-info → yamlscript-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yamlscript
-Version: 0.2.18
+Version: 0.2.20
 Summary: Program in YAML — Code is Data
 Home-page: https://github.com/ingydotnet/yamlscript
 Author: Ingy döt Net

{yamlscript-0.2.18 → yamlscript-0.2.20}/lib/yamlscript/__init__.py

@@ -16,11 +16,12 @@ object that the YAMLScript code evaluates to.
 # This value is automatically updated by 'make bump'.
 # The version number is used to find the correct shared library file.
 # We currently only support binding to an exact version of libys.
-yamlscript_version = '0.2.18'
+yamlscript_version = '0.2.20'
 
 import os, sys
 import ctypes
 import json
+from pathlib import Path
 
 # Require Python 3.6 or greater:
 assert sys.version_info >= (3, 6), \
@@ -40,12 +41,18 @@ def find_libys_path():
       "Unsupported platform '%s' for yamlscript." % sys.platform)
 
   # We currently bind to an exact version of libys.
-  # eg 'libys.so.0.2.18'
+  # eg 'libys.so.0.2.20'
   libys_name = \
     "libys.%s.%s" % (so, yamlscript_version)
 
-  # Use LD_LIBRARY_PATH to find libys shared library, or default to
-  # '/usr/local/lib' (where it is installed by default):
+  # First look for the shared library bundled in platform wheels.
+  bundled_path = \
+    Path(__file__).resolve().parent / 'libys' / libys_name
+  if bundled_path.is_file():
+    return str(bundled_path)
+
+  # Then use LD_LIBRARY_PATH to find libys shared library, or default
+  # to '/usr/local/lib' (where it is installed by default):
   ld_library_path = os.environ.get('LD_LIBRARY_PATH')
   ld_library_paths = ld_library_path.split(':') if ld_library_path else []
   ld_library_paths.append('/usr/local/lib')

{yamlscript-0.2.18 → yamlscript-0.2.20/lib/yamlscript.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yamlscript
-Version: 0.2.18
+Version: 0.2.20
 Summary: Program in YAML — Code is Data
 Home-page: https://github.com/ingydotnet/yamlscript
 Author: Ingy döt Net

{yamlscript-0.2.18 → yamlscript-0.2.20}/setup.py

@@ -1,7 +1,7 @@
-version = '0.2.18'
-
-from setuptools import setup
 import pathlib
+from setuptools import setup
+
+version = '0.2.20'
 
 root = pathlib.Path(__file__).parent.resolve()
 
@@ -9,6 +9,24 @@ long_description = \
   (root / '.long_description.md') \
   .read_text(encoding='utf-8')
 
+cmdclass = {}
+
+try:
+  from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
+
+  class bdist_wheel(_bdist_wheel):
+    def finalize_options(self):
+      _bdist_wheel.finalize_options(self)
+      self.root_is_pure = False
+
+    def get_tag(self):
+      python, abi, plat = _bdist_wheel.get_tag(self)
+      return 'py3', 'none', plat
+
+  cmdclass['bdist_wheel'] = bdist_wheel
+except ImportError:
+  pass
+
 setup(
   name = 'yamlscript',
   version = version,
@@ -21,14 +39,18 @@ setup(
 
   packages = ['yamlscript'],
   package_dir = {'': 'lib'},
+  package_data = {
+    'yamlscript': [
+      'libys/libys.so.*',
+      'libys/libys.dylib.*',
+    ],
+  },
+  cmdclass = cmdclass,
 
   python_requires = '>=3.6, <4',
   install_requires = [
     'pyyaml',
   ],
-  setup_requires = [
-    'wheel',
-  ],
 
   keywords = ['yaml', 'language'],
   classifiers = [