[BACK]Return to patch-setup.py CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / www / py-curl / patches

File: [cvs.NetBSD.org] / pkgsrc / www / py-curl / patches / patch-setup.py (download)

Revision 1.2, Mon Aug 20 07:31:51 2018 UTC (23 months, 3 weeks ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, HEAD
Changes since 1.1: +17 -2 lines

py-curl: only use distutils (used to import setuptools when wheels were installed)

$NetBSD: patch-setup.py,v 1.2 2018/08/20 07:31:51 adam Exp $

Stick to distutils.
Add multi Python variant support.

--- setup.py.orig	2018-06-02 04:59:02.000000000 +0000
+++ setup.py
@@ -10,12 +10,7 @@ VERSION = "7.43.0.2"
 
 import glob, os, re, sys, subprocess
 import distutils
-try:
-    import wheel
-    if wheel:
-        from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from distutils.core import setup
 from distutils.extension import Extension
 from distutils.util import split_quoted
 from distutils.version import LooseVersion
@@ -605,9 +600,9 @@ def get_data_files():
     # a list of tuples with (path to install to, a list of local files)
     data_files = []
     if sys.platform == "win32":
-        datadir = os.path.join("doc", PACKAGE)
+        datadir = os.path.join("doc", PACKAGE + sys.version[0:3])
     else:
-        datadir = os.path.join("share", "doc", PACKAGE)
+        datadir = os.path.join("share", "doc", PACKAGE  + sys.version[0:3])
     #
     files = ["AUTHORS", "ChangeLog", "COPYING-LGPL", "COPYING-MIT",
         "INSTALL.rst", "README.rst", "RELEASE-NOTES.rst"]