From 7aa0dc03ceb8b3f9d1fee8720227fe40a1ab619a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= Date: Thu, 5 Jan 2017 14:55:25 -0500 Subject: [PATCH 1/4] Support setuptools. --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc405dd..27023ff 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,10 @@ #!/usr/bin/env python -from distutils.core import setup +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + setup( name = "pyke", From 8aeae16c964b6c1a64759a7fcfe9b065c77d3879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= Date: Thu, 5 Jan 2017 14:55:36 -0500 Subject: [PATCH 2/4] Add ignores. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a814fde --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.py[oc] +*.egg-info/ +.hg +dist/ +build/ From 6f5267a378051d1d512ca18da5e8734ba6384db8 Mon Sep 17 00:00:00 2001 From: Evgeny Cherkashin Date: Tue, 16 May 2017 12:54:38 +0800 Subject: [PATCH 3/4] Convert to setuptools to allow develop command. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc405dd..90ffe34 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup setup( name = "pyke", From ebed646f0255d3d7f492e9ce5060f6f9333bae76 Mon Sep 17 00:00:00 2001 From: Evgeny Cherkashin Date: Tue, 16 May 2017 13:02:02 +0800 Subject: [PATCH 4/4] Merge bug --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5b53f09..09a3581 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ try: from setuptools import setup except ImportError: -from distutils.core import setup + from distutils.core import setup setup( name = "pyke",