From 4f78a9d65bca9f09da9d1650664f44c645002ff0 Mon Sep 17 00:00:00 2001 From: alexlan Date: Nov 12 2007 08:49:52 +0000 Subject: - Drop patch to setup.py, applied upstream Sun Oct 28 2007 Alex Lancaster 1.44-1 - Update to latest upstream (1.44). --- diff --git a/.cvsignore b/.cvsignore index d73c5fe..69e3f4a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -biopython-1.43.tar.gz +biopython-1.44.tar.gz diff --git a/biopython-setup_test.patch b/biopython-setup_test.patch deleted file mode 100644 index 04f0489..0000000 --- a/biopython-setup_test.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: setup.py -=================================================================== -RCS file: /home/repository/biopython/biopython/setup.py,v -retrieving revision 1.116 -diff -u -p -r1.116 setup.py ---- setup.py 17 Mar 2007 19:21:04 -0000 1.116 -+++ setup.py 11 Apr 2007 03:37:48 -0000 -@@ -238,11 +238,18 @@ class test_biopython(Command): - - """ - description = "Automatically run the test suite for Biopython." -- user_options = [] # distutils complains if this is not here. -- def initialize_options(self): # distutils wants this -- pass -- def finalize_options(self): # this too -+ -+ user_options = [ -+ # provide the option to run tests in no-gui mode -+ ('no-gui', None, "Do not run in GUI mode") -+ ] -+ -+ def initialize_options(self): -+ self.no_gui = None -+ -+ def finalize_options(self): - pass -+ - def run(self): - this_dir = os.getcwd() - -@@ -250,7 +257,10 @@ class test_biopython(Command): - os.chdir("Tests") - sys.path.insert(0, '') - import run_tests -- run_tests.main([]) -+ if self.no_gui: -+ run_tests.main(['--no-gui']) -+ else: -+ run_tests.main([]) - - # change back to the current directory - os.chdir(this_dir) -Index: Tests/run_tests.py -=================================================================== -RCS file: /home/repository/biopython/biopython/Tests/run_tests.py,v -retrieving revision 1.8 -diff -u -p -r1.8 run_tests.py ---- Tests/run_tests.py 9 Mar 2007 23:36:43 -0000 1.8 -+++ Tests/run_tests.py 11 Apr 2007 03:37:48 -0000 -@@ -56,7 +56,7 @@ def main(argv): - - # get the command line options - try: -- opts, args = getopt.getopt(argv[1:], 'g', -+ opts, args = getopt.getopt(argv, 'g', - ["generate", "no-gui", "help"]) - except getopt.error, msg: - print msg -@@ -316,5 +316,5 @@ def convert_string_newlines(line): - return line - - if __name__ == "__main__": -- sys.exit(main(sys.argv)) -+ sys.exit(main(sys.argv[1:])) - diff --git a/python-biopython.spec b/python-biopython.spec index 935383f..cd6dbfa 100644 --- a/python-biopython.spec +++ b/python-biopython.spec @@ -2,11 +2,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-biopython -Version: 1.43 -Release: 5%{?dist} +Version: 1.44 +Release: 2%{?dist} Summary: Python tools for computational molecular biology Source0: http://biopython.org/DIST/biopython-%{version}.tar.gz -Patch0: biopython-setup_test.patch License: MIT Url: http://www.biopython.org/ Group: Development/Libraries @@ -30,7 +29,6 @@ biology. %prep %setup -q -n biopython-%{version} -%patch0 -p0 # remove all execute bits from documentation and fix line endings find Scripts -type f -exec chmod -x {} 2>/dev/null ';' @@ -73,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/BioSQL/* %changelog +* Sun Oct 28 2007 Alex Lancaster 1.44-2 +- Drop patch to setup.py, applied upstream + +* Sun Oct 28 2007 Alex Lancaster 1.44-1 +- Update to latest upstream (1.44). + * Mon Aug 27 2007 Alex Lancaster 1.43-5 - Used "MIT" as short license name as the "Biopython License Agreement" is the same as the CMU MIT variant. diff --git a/sources b/sources index d378292..9b0c241 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c275b321bb1db7d8bda764913aaedcd biopython-1.43.tar.gz +762c7a358af9dc58b712b8b4bb99d0c2 biopython-1.44.tar.gz