From 79278f78b361d15918c913c52557590a2ae95dcd Mon Sep 17 00:00:00 2001 From: utahta Date: Wed, 17 Nov 2010 00:49:42 +0900 Subject: [PATCH] add setup.py MANIFEST.in --- MANIFEST.in | 1 + pythonbrew/commands/install.py | 2 +- pythonbrew/commands/list.py | 6 +++--- pythonbrew/define.py | 22 +++++++++++----------- pythonbrew/downloader.py | 8 ++++---- pythonbrew/installer.py | 6 +++--- setup.py | 31 +++++++++++++++++++++++++++++++ 7 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 MANIFEST.in create mode 100755 setup.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..2a25d02 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +recursive-include pythonbrew/patches * diff --git a/pythonbrew/commands/install.py b/pythonbrew/commands/install.py index 0b23306..b78ea5e 100644 --- a/pythonbrew/commands/install.py +++ b/pythonbrew/commands/install.py @@ -36,6 +36,6 @@ class InstallCommand(Command): # Install Python PythonInstaller(args[0], options).install() else: - logger.error("Package not found.") + logger.info("Unknown python version.") InstallCommand() diff --git a/pythonbrew/commands/list.py b/pythonbrew/commands/list.py index 08ee2c9..42b4153 100644 --- a/pythonbrew/commands/list.py +++ b/pythonbrew/commands/list.py @@ -1,6 +1,6 @@ import re from pythonbrew.basecommand import Command -from pythonbrew.define import PYTHON_PACKAGE_URL, LATEST_VERSIONS_OF_PYTHON +from pythonbrew.define import PYTHON_VERSION_URL, LATEST_VERSIONS_OF_PYTHON from pythonbrew.util import Package from pythonbrew.log import logger @@ -31,13 +31,13 @@ class ListCommand(Command): for pkgname in pkgs: logger.info("%s" % pkgname) else: - print "Package not found. `%s`" % pkg.name + print "Python version not found. `%s`" % pkg.name else: for pkgname in self._get_packages_name(options): logger.info("%s" % pkgname) def _get_packages_name(self, options): - return ["Python-%s" % version for version in sorted(PYTHON_PACKAGE_URL.keys()) + return ["Python-%s" % version for version in sorted(PYTHON_VERSION_URL.keys()) if(options.all_versions or (not options.all_versions and version in LATEST_VERSIONS_OF_PYTHON))] ListCommand() diff --git a/pythonbrew/define.py b/pythonbrew/define.py index da20905..d2e645c 100644 --- a/pythonbrew/define.py +++ b/pythonbrew/define.py @@ -37,11 +37,11 @@ PYTHONBREW_UPDATE_URL = { "0.6": "https://github.com/utahta/pythonbrew/tarball/0.6", } -# download Python package url -PYTHON_PACKAGE_URL = {} -PYTHON_PACKAGE_URL["1.5.2"] = "http://www.python.org/ftp/python/src/py152.tgz" -PYTHON_PACKAGE_URL["1.6.1"] = "http://www.python.org/download/releases/1.6.1/Python-1.6.1.tar.gz" -_PYTHON_PACKAGE_VERSIONS = [ +# download Python version url +PYTHON_VERSION_URL = {} +PYTHON_VERSION_URL["1.5.2"] = "http://www.python.org/ftp/python/src/py152.tgz" +PYTHON_VERSION_URL["1.6.1"] = "http://www.python.org/download/releases/1.6.1/Python-1.6.1.tar.gz" +_PYTHON_VERSIONS_LIST = [ "2.0", "2.0.1", "2.1", "2.1.1", "2.1.2", "2.1.3", "2.2", "2.2.1", "2.2.2", "2.2.3", @@ -53,12 +53,12 @@ _PYTHON_PACKAGE_VERSIONS = [ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", ] -for version in _PYTHON_PACKAGE_VERSIONS: - PYTHON_PACKAGE_URL[version] = "http://www.python.org/ftp/python/%s/Python-%s.tgz" % (version, version) -del _PYTHON_PACKAGE_VERSIONS -PYTHON_PACKAGE_URL["3.2a1"] = "http://www.python.org/ftp/python/3.2/Python-3.2a1.tgz" -PYTHON_PACKAGE_URL["3.2a2"] = "http://www.python.org/ftp/python/3.2/Python-3.2a2.tgz" -PYTHON_PACKAGE_URL["3.2a3"] = "http://www.python.org/ftp/python/3.2/Python-3.2a3.tgz" +for version in _PYTHON_VERSIONS_LIST: + PYTHON_VERSION_URL[version] = "http://www.python.org/ftp/python/%s/Python-%s.tgz" % (version, version) +del _PYTHON_VERSIONS_LIST +PYTHON_VERSION_URL["3.2a1"] = "http://www.python.org/ftp/python/3.2/Python-3.2a1.tgz" +PYTHON_VERSION_URL["3.2a2"] = "http://www.python.org/ftp/python/3.2/Python-3.2a2.tgz" +PYTHON_VERSION_URL["3.2a3"] = "http://www.python.org/ftp/python/3.2/Python-3.2a3.tgz" LATEST_VERSIONS_OF_PYTHON = ['1.5.2', '1.6.1', '2.0.1', '2.1.3', '2.2.3', '2.3.7', '2.4.6', '2.5.5', '2.6.6', '2.7', diff --git a/pythonbrew/downloader.py b/pythonbrew/downloader.py index f049aee..7bf8bce 100644 --- a/pythonbrew/downloader.py +++ b/pythonbrew/downloader.py @@ -2,7 +2,7 @@ import sys import urllib import urllib2 from pythonbrew.util import size_format -from pythonbrew.define import PYTHON_PACKAGE_URL, PYTHONBREW_UPDATE_URL +from pythonbrew.define import PYTHON_VERSION_URL, PYTHONBREW_UPDATE_URL from pythonbrew.log import logger def get_response_from_url(url): @@ -47,7 +47,7 @@ def get_pythonbrew_update_url(version): return PYTHONBREW_UPDATE_URL[version] return None -def get_python_package_url(version): - if PYTHON_PACKAGE_URL.has_key(version): - return PYTHON_PACKAGE_URL[version] +def get_python_version_url(version): + if PYTHON_VERSION_URL.has_key(version): + return PYTHON_VERSION_URL[version] return None diff --git a/pythonbrew/installer.py b/pythonbrew/installer.py index fdd924a..3254851 100644 --- a/pythonbrew/installer.py +++ b/pythonbrew/installer.py @@ -12,7 +12,7 @@ from pythonbrew.define import PATH_BUILD, PATH_BIN, PATH_DISTS, PATH_PYTHONS,\ PATH_SCRIPTS_PYTHONBREW_COMMANDS, INSTALLER_ROOT, PATH_BIN_PYTHONBREW,\ PATH_BIN_PYBREW, ROOT, PATH_LOG, DISTRIBUTE_SETUP_DLSITE, PATH_PATCHES,\ PATH_PATCHES_MACOSX_PYTHON25, PATH_PATCHES_MACOSX_PYTHON24 -from pythonbrew.downloader import get_python_package_url, Downloader,\ +from pythonbrew.downloader import get_python_version_url, Downloader,\ get_response_from_url from pythonbrew.log import logger @@ -99,9 +99,9 @@ class PythonInstaller(object): pkg = Package(splitext(filename)[0]) else: pkg = Package(arg) - self.download_url = get_python_package_url(pkg.version) + self.download_url = get_python_version_url(pkg.version) if not self.download_url: - logger.error("Unknown package: `%s`" % pkg.name) + logger.info("Unknown python version: `%s`" % pkg.name) sys.exit(1) filename = Link(self.download_url).filename self.pkg = pkg diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..3e1e12c --- /dev/null +++ b/setup.py @@ -0,0 +1,31 @@ +import os +from setuptools import setup, find_packages +from pythonbrew.define import VERSION + +README = os.path.join(os.path.dirname(__file__),'README.rst') +long_description = open(README).read() + "\n" + +setup(name='pythonbrew', + version=VERSION, + description="Manage python installations in your $HOME", + long_description=long_description, + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Topic :: Software Development :: Build Tools', + 'Programming Language :: Python :: 2.4', + 'Programming Language :: Python :: 2.5', + 'Programming Language :: Python :: 2.6', + ], + keywords='pythonbrew pip easy_install distutils setuptools virtualenv', + author='utahta', + author_email='labs.ninxit@gmail.com', + url='https://github.com/utahta/pythonbrew', + license='MIT', + packages=find_packages(), + include_package_data=True, + entry_points=dict(console_scripts=['pythonbrew_install=pythonbrew.installer:install_pythonbrew']), + test_suite='nose.collector', + tests_require=['nose'], + zip_safe=False)