Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r150 - trunk/repoguard: . requires

repoguard
Discussion topic

Back to topic list

svn commit: r150 - trunk/repoguard: . requires

Author schlauch
Full name Tobias Schlauch
Date 2012-11-13 06:36:46 PST
Message Author: schlauch
Date: 2012-11-13 06:36:46-0800
New Revision: 150

Modified:
   trunk/repoguard/requ​ires/requires-mantis​.txt
   trunk/repoguard/requ​ires/requires.txt
   trunk/repoguard/setup.py

Log:
Corrected version numbers of requirements.
Core dependencies should be "pulled" explicitly.

Modified: trunk/repoguard/requ​ires/requires-mantis​.txt
Url: http://repoguard.tig​ris.org/source/brows​e/repoguard/trunk/re​poguard/requires/req​uires-mantis.txt?vie​w=diff&pathrev=1​50&r1=149&r2​=150
====================​====================​====================​==================
--- trunk/repoguard/requ​ires/requires-mantis​.txt (original)
+++ trunk/repoguard/requ​ires/requires-mantis​.txt 2012-11-13 06:36:46-0800
@@ -1 +1 @@
-suds>=0.4
\ No newline at end of file
+suds<=0.3.9
\ No newline at end of file

Modified: trunk/repoguard/requ​ires/requires.txt
Url: http://repoguard.tig​ris.org/source/brows​e/repoguard/trunk/re​poguard/requires/req​uires.txt?view=diff​&pathrev=150&​r1=149&r2=150
====================​====================​====================​==================
--- trunk/repoguard/requ​ires/requires.txt (original)
+++ trunk/repoguard/requ​ires/requires.txt 2012-11-13 06:36:46-0800
@@ -1,2 +1,2 @@
 configobj>=4.6.0
-setuptools>=0.6
\ No newline at end of file
+distribute>=0.6.24s
\ No newline at end of file

Modified: trunk/repoguard/setup.py
Url: http://repoguard.tig​ris.org/source/brows​e/repoguard/trunk/re​poguard/setup.py?vie​w=diff&pathrev=1​50&r1=149&r2​=150
====================​====================​====================​==================
--- trunk/repoguard/setup.py (original)
+++ trunk/repoguard/setup.py 2012-11-13 06:36:46-0800
@@ -128,8 +128,8 @@
     _set_pythonpath()
     config_home = _get_config_home()
     console_scripts = _get_console_scripts()
- install_requires, extras_require = _get_requirements()
- _run_setup(config_home, console_scripts, install_requires, extras_require)
+ extras_require = _get_requirements()
+ _run_setup(config_home, console_scripts, extras_require)
     
 def _set_pythonpath():
     python_path = [os.path.realpath(path) for path in ["src", "test"]]
@@ -154,14 +154,11 @@
 
 def _get_requirements():
     extras_require = dict()
- install_requires = list()
     for name in os.listdir("requires"):
- if name == "requires.txt":
- install_requires = (_read_requirements_​from_file("requires/​" + name))
- elif name.startswith("requires"):
+ if name.startswith("requires") and name != "requires.txt":
             extras_name = name[9:-4]
             extras_require[extras_name] = _read_requirements_f​rom_file("requires/"​ + name)
- return install_requires, extras_require
+ return extras_require
 
 def _read_requirements_f​rom_file(path):
     file_object = open(path, "rb")
@@ -170,7 +167,7 @@
     finally:
         file_object.close()
         
-def _run_setup(config_home, console_scripts, install_requires, extras_require):
+def _run_setup(config_home, console_scripts, extras_require):
     _write_config_home_c​onstant(config_home)​
     setuptools.setup(
         name="repoguard",
@@ -220,7 +217,6 @@
                 "cfg/templates/python.tpl.conf"
             ])
         ],
- install_requires=ins​tall_requires,
         extras_require=extras_require,
         entry_points={
             "console_scripts": [

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r150 - trunk/repoguard: . requires schlauch Tobias Schlauch 2012-11-13 06:36:46 PST
Messages per page: