Fix setup.py for newer versions (#142)

manugarg · Feb 22, 2023 · 36010ed · 36010ed
1 parent 853e8f4
commit 36010ed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/pymod/setup.py b/src/pymod/setup.py
@@ -43,9 +43,14 @@ def setup_dir():
   return os.path.dirname(os.path.join(os.getcwd(), sys.argv[0]))
 
 def module_path():
-  py_ver = '.'.join([str(x) for x in sys.version_info[0:2]])
-  return glob.glob(os.path.join(setup_dir(), 'build', 'lib*%s' % py_ver))[0]
-
+  py_ver = '*'.join([str(x) for x in sys.version_info[0:2]])
+  print('Python version: %s' % py_ver)
+
+  builddir = os.path.join(setup_dir(), 'build')
+  print('Build dir: %s' % builddir)
+  print(os.listdir(builddir))
+
+  return glob.glob(os.path.join(builddir, 'lib*%s*' % py_ver))[0]
 
 def sanitize_version(ver):
   ver = ver.strip()

diff --git a/tests/runtests.py b/tests/runtests.py
@@ -25,11 +25,18 @@
 import os
 import sys
 
+def module_path(tests_dir):
+  py_ver = '*'.join([str(x) for x in sys.version_info[0:2]])
+
+  builddir = os.path.join(tests_dir, '..', 'src', 'pymod', 'build')
+  print('Build dir: %s', builddir)
+  print(os.listdir(builddir))
+
+  return glob.glob(os.path.join(builddir, 'lib*%s' % py_ver))[0]
+
 def runtests(pacfile, testdata, tests_dir):
-  py_ver = '.'.join([str(x) for x in sys.version_info[0:2]])
   try:
-    pacparser_module_path = glob.glob(os.path.join(
-      tests_dir, '..', 'src', 'pymod', 'build', 'lib*%s' % py_ver))[0]
+    pacparser_module_path = module_path(tests_dir)
   except Exception:
     raise Exception('Tests failed. Could not determine pacparser path.')
   if 'DEBUG' in os.environ: print('Pacparser module path: %s' %