From cb68eef0865df6aedbc11cd81888625a70da6777 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 25 Nov 2010 17:01:25 +0100 Subject: Moved everything into the git subdirectory - some tests still need to be adjusted --- setup.py | 86 ---------------------------------------------------------------- 1 file changed, 86 deletions(-) delete mode 100755 setup.py (limited to 'setup.py') diff --git a/setup.py b/setup.py deleted file mode 100755 index 54d78c50..00000000 --- a/setup.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python -try: - from setuptools import setup, find_packages -except ImportError: - from ez_setup import use_setuptools - use_setuptools() - from setuptools import setup, find_packages - -from distutils.command.build_py import build_py as _build_py -from setuptools.command.sdist import sdist as _sdist -import os -from os import path - -v = open(path.join(path.dirname(__file__), 'VERSION')) -VERSION = v.readline().strip() -v.close() - - -class build_py(_build_py): - def run(self): - init = path.join(self.build_lib, 'git', '__init__.py') - if path.exists(init): - os.unlink(init) - _build_py.run(self) - _stamp_version(init) - self.byte_compile([init]) - - -class sdist(_sdist): - def make_release_tree (self, base_dir, files): - _sdist.make_release_tree(self, base_dir, files) - orig = '__init__.py' - assert path.exists(orig) - dest = path.join(base_dir, orig) - if hasattr(os, 'link') and path.exists(dest): - os.unlink(dest) - self.copy_file(orig, dest) - _stamp_version(dest) - - -def _stamp_version(filename): - found, out = False, [] - f = open(filename, 'r') - for line in f: - if '__version__ =' in line: - line = line.replace("'git'", "'%s'" % VERSION) - found = True - out.append(line) - f.close() - - if found: - f = open(filename, 'w') - f.writelines(out) - f.close() - else: - print >> sys.stderr, "WARNING: Couldn't find version line in file %s" % filename - - -setup(name = "GitPython", - cmdclass={'build_py': build_py, 'sdist': sdist}, - version = VERSION, - description = "Python Git Library", - author = "Sebastian Thiel, Michael Trier", - author_email = "byronimo@gmail.com, mtrier@gmail.com", - url = "http://gitorious.org/projects/git-python/", - packages = ['git.'+p for p in find_packages('.')], - py_modules = ['git.'+f[:-3] for f in os.listdir('.') if f.endswith('.py')], - package_data = {'git.test' : ['fixtures/*']}, - package_dir = {'git':''}, - license = "BSD License", - requires=('gitdb (>=0.5.1)',), - install_requires='gitdb >= 0.5.1', - zip_safe=False, - long_description = """\ -GitPython is a python library used to interact with Git repositories""", - classifiers = [ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 2.5", - "Programming Language :: Python :: 2.6", - "Topic :: Software Development :: Libraries :: Python Modules", - ] - ) -- cgit v1.2.1 From f24736ad5b55a89b1057d68d6b3f3cd01018a2e8 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 25 Nov 2010 17:44:32 +0100 Subject: Fixed setup tools --- setup.py | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100755 setup.py (limited to 'setup.py') diff --git a/setup.py b/setup.py new file mode 100755 index 00000000..54d78c50 --- /dev/null +++ b/setup.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +try: + from setuptools import setup, find_packages +except ImportError: + from ez_setup import use_setuptools + use_setuptools() + from setuptools import setup, find_packages + +from distutils.command.build_py import build_py as _build_py +from setuptools.command.sdist import sdist as _sdist +import os +from os import path + +v = open(path.join(path.dirname(__file__), 'VERSION')) +VERSION = v.readline().strip() +v.close() + + +class build_py(_build_py): + def run(self): + init = path.join(self.build_lib, 'git', '__init__.py') + if path.exists(init): + os.unlink(init) + _build_py.run(self) + _stamp_version(init) + self.byte_compile([init]) + + +class sdist(_sdist): + def make_release_tree (self, base_dir, files): + _sdist.make_release_tree(self, base_dir, files) + orig = '__init__.py' + assert path.exists(orig) + dest = path.join(base_dir, orig) + if hasattr(os, 'link') and path.exists(dest): + os.unlink(dest) + self.copy_file(orig, dest) + _stamp_version(dest) + + +def _stamp_version(filename): + found, out = False, [] + f = open(filename, 'r') + for line in f: + if '__version__ =' in line: + line = line.replace("'git'", "'%s'" % VERSION) + found = True + out.append(line) + f.close() + + if found: + f = open(filename, 'w') + f.writelines(out) + f.close() + else: + print >> sys.stderr, "WARNING: Couldn't find version line in file %s" % filename + + +setup(name = "GitPython", + cmdclass={'build_py': build_py, 'sdist': sdist}, + version = VERSION, + description = "Python Git Library", + author = "Sebastian Thiel, Michael Trier", + author_email = "byronimo@gmail.com, mtrier@gmail.com", + url = "http://gitorious.org/projects/git-python/", + packages = ['git.'+p for p in find_packages('.')], + py_modules = ['git.'+f[:-3] for f in os.listdir('.') if f.endswith('.py')], + package_data = {'git.test' : ['fixtures/*']}, + package_dir = {'git':''}, + license = "BSD License", + requires=('gitdb (>=0.5.1)',), + install_requires='gitdb >= 0.5.1', + zip_safe=False, + long_description = """\ +GitPython is a python library used to interact with Git repositories""", + classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 2.5", + "Programming Language :: Python :: 2.6", + "Topic :: Software Development :: Libraries :: Python Modules", + ] + ) -- cgit v1.2.1 From 0cfe75db81bc099e4316895ff24d65ef865bced6 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 25 Nov 2010 17:53:50 +0100 Subject: Updated information files --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 54d78c50..bafd5003 100755 --- a/setup.py +++ b/setup.py @@ -29,8 +29,8 @@ class build_py(_build_py): class sdist(_sdist): def make_release_tree (self, base_dir, files): _sdist.make_release_tree(self, base_dir, files) - orig = '__init__.py' - assert path.exists(orig) + orig = path.join('git', '__init__.py') + assert path.exists(orig), orig dest = path.join(base_dir, orig) if hasattr(os, 'link') and path.exists(dest): os.unlink(dest) -- cgit v1.2.1 From 9004e3a1cf33110f2cbc458f1dc3259c930ad9b4 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 25 Nov 2010 18:06:50 +0100 Subject: update setup.py to allow binary builds, which is required for installation and distribution --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bafd5003..c18d80b5 100755 --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ except ImportError: from distutils.command.build_py import build_py as _build_py from setuptools.command.sdist import sdist as _sdist import os +import sys from os import path v = open(path.join(path.dirname(__file__), 'VERSION')) @@ -40,7 +41,12 @@ class sdist(_sdist): def _stamp_version(filename): found, out = False, [] - f = open(filename, 'r') + try: + f = open(filename, 'r') + except (IOError, OSError): + print >> sys.stderr, "Couldn't find file %s to stamp version" % filename + return + #END handle error, usually happens during binary builds for line in f: if '__version__ =' in line: line = line.replace("'git'", "'%s'" % VERSION) -- cgit v1.2.1