[Milkymist-devel] [PATCH] setup.py: simplify

Sat, 10 Mar 2012 15:10:12 -0800 

>From 747e3596a5fc36d1cff0f4b62fc32f5a8aee6c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alain=20P=C3=A9teut?= <[email protected]>
Date: Sat, 10 Mar 2012 20:01:14 +0100
Subject: [PATCH] setup.py: simplify
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


Signed-off-by: Alain Péteut <[email protected]>
---
 setup.py |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index 84bfd55..0c8c16d 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,8 @@
 """ Migen's distutils distribution and installation script. """
 
 import sys, os
-from distutils.core import setup
+from setuptools import setup
+from setuptools import find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, "README")).read()
@@ -13,14 +14,6 @@ if sys.version_info < required_version:
        raise SystemExit("migen requires python {0} or greater".format(
                ".".join(map(str, required_version))))
 
-packages = ["migen"]
-packages_dir = os.path.sep.join((here, packages[0]))
-for entry in os.listdir(packages_dir):
-       if (os.path.isdir(os.path.sep.join((packages_dir, entry))) and
-        os.path.isfile(os.path.sep.join((packages_dir, entry, 
"__init__.py")))):
-               packages.append(".".join((packages[0], entry)))
-
-packages_dir={"": "migen"}
 setup(
        name="migen",
        version="unknown",
@@ -30,7 +23,7 @@ setup(
        author_email="[email protected]",
        url="http://www.milkymist.org";,
        download_url="https://github.com/milkymist/migen";,
-       packages=packages,
+       packages=find_packages(here),
        license="GPL",
        platforms=["Any"],
        keywords="HDL ASIC FPGA hardware design",
-- 
1.7.9
From 747e3596a5fc36d1cff0f4b62fc32f5a8aee6c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alain=20P=C3=A9teut?= <[email protected]>
Date: Sat, 10 Mar 2012 20:01:14 +0100
Subject: [PATCH] setup.py: simplify
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


Signed-off-by: Alain Péteut <[email protected]>
---
 setup.py |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index 84bfd55..0c8c16d 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,8 @@
 """ Migen's distutils distribution and installation script. """
 
 import sys, os
-from distutils.core import setup
+from setuptools import setup
+from setuptools import find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, "README")).read()
@@ -13,14 +14,6 @@ if sys.version_info < required_version:
 	raise SystemExit("migen requires python {0} or greater".format(
 		".".join(map(str, required_version))))
 
-packages = ["migen"]
-packages_dir = os.path.sep.join((here, packages[0]))
-for entry in os.listdir(packages_dir):
-	if (os.path.isdir(os.path.sep.join((packages_dir, entry))) and
-	 os.path.isfile(os.path.sep.join((packages_dir, entry, "__init__.py")))):
-		packages.append(".".join((packages[0], entry)))
-
-packages_dir={"": "migen"}
 setup(
 	name="migen",
 	version="unknown",
@@ -30,7 +23,7 @@ setup(
 	author_email="[email protected]",
 	url="http://www.milkymist.org";,
 	download_url="https://github.com/milkymist/migen";,
-	packages=packages,
+	packages=find_packages(here),
 	license="GPL",
 	platforms=["Any"],
 	keywords="HDL ASIC FPGA hardware design",
-- 
1.7.9


_______________________________________________
http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org
IRC: #milkymist@Freenode

Reply via email to