August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10760 - in /trunk/sat-solver/bindings: ./ python/tests/
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 18:20:53 2008 New Revision: 10760 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10760&view=rev Log: better support iterators on Python Modified: trunk/sat-solver/bindings/dependency.i trunk/sat-solver/bindings/pool.i trunk/sat-solver/bindings/python/tests/relation.py trunk/sat-solver/bindings/python/tests/repo.py trunk/sat-solver/bindings/python/tests/repodata.py trunk/sat-solver/bindings/python/tests/rpmdb.py trunk/sat-solver/bindings/python/tests/solvable.py trunk/sat-solver/bindings/repo.i trunk/sat-solver/bindings/satsolver.i trunk/sat-solver/bindings/solver.i Modified: trunk/sat-solver/bindings/dependency.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dependency.i… ============================================================================== --- trunk/sat-solver/bindings/dependency.i (original) +++ trunk/sat-solver/bindings/dependency.i Tue Aug 5 18:20:53 2008 @@ -73,6 +73,13 @@ void each() { dependency_relations_iterate( $self, dependency_relations_iterate_callback ); } #endif +#if defined(SWIGPYTHON) + %pythoncode %{ + def __iter__(self): + r = range(0,self.size()) + while r: + yield self.get(r.pop(0)) + %} +#endif } - Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Tue Aug 5 18:20:53 2008 @@ -179,6 +179,7 @@ */ void each_provider( Relation *rel ) { +#if defined(SWIGRUBY) Id p, *pp; Pool *pool = $self; if (!$self->whatprovides) @@ -186,10 +187,12 @@ FOR_PROVIDES(p, pp, rel->id) generic_xsolvables_iterate_callback( xsolvable_new( $self, p ) ); +#endif } void each_provider( const char *name ) { +#if defined(SWIGRUBY) Id p, *pp; Pool *pool = $self; if (!$self->whatprovides) @@ -197,6 +200,7 @@ FOR_PROVIDES(p, pp, str2id( $self, name, 0) ) generic_xsolvables_iterate_callback( xsolvable_new( $self, p ) ); +#endif } /* @@ -227,8 +231,19 @@ XSolvable *get( int i ) { return xsolvable_get( $self, i, NULL ); } +#if defined(SWIGRUBY) void each() { pool_xsolvables_iterate( $self, generic_xsolvables_iterate_callback ); } +#endif + +#if defined(SWIGPYTHON) + %pythoncode %{ + def __iter__(self): + r = range(0,self.size()) + while r: + yield self.get(r.pop(0)) + %} +#endif XSolvable *find( char *name, Repo *repo = NULL ) { return xsolvable_find( $self, name, repo ); } Modified: trunk/sat-solver/bindings/python/tests/relation.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/relation.py (original) +++ trunk/sat-solver/bindings/python/tests/relation.py Tue Aug 5 18:20:53 2008 @@ -55,15 +55,13 @@ rel = self.pool.create_relation( "A", satsolver.REL_EQ, "1.0-0" ) assert rel print "Relation: ", rel - for i in range(0, self.repo.size()): - s = self.repo.get(i) + for s in self.repo: if not s.provides().empty(): print "%s provides %s" % (s, s.provides().get(1)) - for j in range(0,s.provides().size()): - p = s.provides().get(j) + for p in s.provides(): if p is not None: - res1 = p.cmp(rel) + res1 = cmp(p, rel) print p, " cmp ", rel, " => ", res1 res2 = p.match(rel) print p, " match ", rel, " => ", res1 Modified: trunk/sat-solver/bindings/python/tests/repo.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/repo.py (original) +++ trunk/sat-solver/bindings/python/tests/repo.py Tue Aug 5 18:20:53 2008 @@ -58,8 +58,8 @@ assert pool pool.set_arch("i686") repo = pool.add_solv( "os11-biarch.solv" ) - for i in range(0,repo.size()): - print repo.get(i) + for s in repo: + print s assert True Modified: trunk/sat-solver/bindings/python/tests/repodata.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/repodata.py (original) +++ trunk/sat-solver/bindings/python/tests/repodata.py Tue Aug 5 18:20:53 2008 @@ -36,8 +36,7 @@ k = repodata.key(i) print " Key ", k.name(), " is ", k.type(), " with ", k.size(), " bytes" - for i in range(0, repo.size()): - s = repo.get(i) + for s in repo: print "Solvable %s: group %s, time %s, downloadsize %s, installsize %s" % (s, s.attr('solvable:group'), s.attr('solvable:buildtime'), s.attr('solvable:downloadsize'), s.attr('solvable:installsize')) if i == 10: break Modified: trunk/sat-solver/bindings/python/tests/rpmdb.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/rpmdb.py (original) +++ trunk/sat-solver/bindings/python/tests/rpmdb.py Tue Aug 5 18:20:53 2008 @@ -28,8 +28,7 @@ print repo.size(), " installed packages" name = None - for i in range(0, pool.size()): - s = pool.get(i) + for s in pool: print s if i == 7: name = s.name() Modified: trunk/sat-solver/bindings/python/tests/solvable.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/solvable.py (original) +++ trunk/sat-solver/bindings/python/tests/solvable.py Tue Aug 5 18:20:53 2008 @@ -43,8 +43,7 @@ def test_deps(self): return - for i in range(0,self.pool.size()): - s = self.pool.get(i) + for s in pool: print s show_dep( "Provides", s.provides()) show_dep( "Requires", s.requires()) Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Tue Aug 5 18:20:53 2008 @@ -82,6 +82,14 @@ void each() { repo_xsolvables_iterate( $self, generic_xsolvables_iterate_callback ); } #endif +#if defined(SWIGPYTHON) + %pythoncode %{ + def __iter__(self): + r = range(0,self.size()) + while r: + yield self.get(r.pop(0)) + %} +#endif #if defined(SWIGRUBY) /* %rename is rejected by swig for [] */ Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Tue Aug 5 18:20:53 2008 @@ -91,6 +91,7 @@ #include "covenant.h" +#if defined(SWIGRUBY) /* * iterating over (x)solvables ('yield' in Ruby) * (used by Pool, Repo and Solver) @@ -99,12 +100,11 @@ static int generic_xsolvables_iterate_callback( const XSolvable *xs ) { -#if defined(SWIGRUBY) /* FIXME: how to pass 'break' back to the caller ? */ rb_yield( SWIG_NewPointerObj((void*)xs, SWIGTYPE_p__Solvable, 0) ); -#endif return 0; } +#endif %} Modified: trunk/sat-solver/bindings/solver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solver.i?rev… ============================================================================== --- trunk/sat-solver/bindings/solver.i (original) +++ trunk/sat-solver/bindings/solver.i Tue Aug 5 18:20:53 2008 @@ -3,6 +3,7 @@ */ %{ +#if defined(SWIGRUBY) /* * iterating over updates (takes two (x)solvables) ('yield' in Ruby) */ @@ -10,10 +11,8 @@ static int update_xsolvables_iterate_callback( const XSolvable *xs_old, const XSolvable *xs_new ) { -#if defined(SWIGRUBY) /* FIXME: how to pass 'break' back to the caller ? */ rb_yield_values( 2, SWIG_NewPointerObj((void*)xs_old, SWIGTYPE_p__Solvable, 0), SWIG_NewPointerObj((void*)xs_new, SWIGTYPE_p__Solvable, 0) ); -#endif return 0; } @@ -24,10 +23,8 @@ static int solver_decisions_iterate_callback( const Decision *d ) { -#if defined(SWIGRUBY) /* FIXME: how to pass 'break' back to the caller ? */ rb_yield(SWIG_NewPointerObj((void*) d, SWIGTYPE_p__Decision, 0)); -#endif return 0; } @@ -39,12 +36,11 @@ static int solver_problems_iterate_callback( const Problem *p ) { -#if defined(SWIGRUBY) /* FIXME: how to pass 'break' back to the caller ? */ rb_yield( SWIG_NewPointerObj((void*) p, SWIGTYPE_p__Problem, 0) ); -#endif return 0; } +#endif /* SWIGRUBY */ %} @@ -273,8 +269,10 @@ int decision_count() { return $self->decisionq.count; } +#if defined(SWIGRUBY) void each_decision() { return solver_decisions_iterate( $self, solver_decisions_iterate_callback ); } +#endif #if defined(SWIGRUBY) %rename("problems?") problems_found(); @@ -291,6 +289,7 @@ int problems_found() { return $self->problems.count != 0; } +#if defined(SWIGRUBY) void each_problem( Transaction *t ) { return solver_problems_iterate( $self, t, solver_problems_iterate_callback ); } @@ -318,6 +317,7 @@ void each_suggested() { return solver_suggestions_iterate( $self, generic_xsolvables_iterate_callback); } +#endif /* SWIGRUBY */ #if defined(SWIGPERL) SV* getInstallList() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10759 - /branches/SuSE-Linux-11_0-Branch/libzypp/tests/sat/SolvParsing_test.cc
by dmacvicar＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: dmacvicar Date: Tue Aug 5 18:16:45 2008 New Revision: 10759 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10759&view=rev Log: typo Modified: branches/SuSE-Linux-11_0-Branch/libzypp/tests/sat/SolvParsing_test.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/tests/sat/SolvParsing_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/tests/sat/SolvParsing_test.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/tests/sat/SolvParsing_test.cc Tue Aug 5 18:16:45 2008 @@ -108,7 +108,7 @@ //solvable:url: http://www.openssl.org/ //solvable:buildtime: 1165493634 //solvable:installsize: 3845 - BOOST_CHECK_EQUAL(p->installSize(), ByteCount(3845, ByteCount::K)); + BOOST_CHECK_EQUAL(p->installsize(), ByteCount(3845, ByteCount::K)); //solvable:downloadsize: 909 BOOST_CHECK_EQUAL(p->downloadSize(), ByteCount(909, ByteCount::K)); //solvable:mediadir: rpm/i586 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10758 - in /trunk/sat-solver/bindings: CMakeLists.txt satsolver.i solvable.i
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 14:30:42 2008 New Revision: 10758 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10758&view=rev Log: enable Perl (untested) Modified: trunk/sat-solver/bindings/CMakeLists.txt trunk/sat-solver/bindings/satsolver.i trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/CMakeLists.t… ============================================================================== --- trunk/sat-solver/bindings/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/CMakeLists.txt Tue Aug 5 14:30:42 2008 @@ -31,8 +31,8 @@ ADD_SUBDIRECTORY(python) ENDIF(PYTHON_LIBRARY) -#IF (PERL_EXECUTABLE) -# MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") -# ADD_SUBDIRECTORY(perl) -#ENDIF (PERL_EXECUTABLE) +IF (PERL_EXECUTABLE) + MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") + ADD_SUBDIRECTORY(perl) +ENDIF (PERL_EXECUTABLE) Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Tue Aug 5 14:30:42 2008 @@ -48,6 +48,18 @@ #include <rubyio.h> #endif +#if defined(SWIGPERL) +#define Swig_Test(x) (x == NULL) +#define Swig_True (&PL_sv_yes) +#define Swig_False (&PL_sv_no) +#define Swig_Null NULL +#define Swig_Type SV * +#define Swig_Int(x) SWIG_From_long(x) +#define Swig_String(x) SWIG_FromCharPtr(x) +#define Swig_Array(x) NULL +#define Swig_Append(x,y) av_create_and_push(&x, y) +#endif + /* satsolver core includes */ #include "policy.h" #include "bitmap.h" Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?r… ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Tue Aug 5 14:30:42 2008 @@ -318,6 +318,9 @@ #if defined(SWIGPYTHON) PyObject *attr( const char *name ) #endif +#if defined(SWIGPERL) + SV *attr( const char *name ) +#endif { #if defined(SWIGRUBY) char *name; @@ -377,6 +380,9 @@ #if defined(SWIGPYTHON) PyObject *attr_exists( const char *name ) #endif +#if defined(SWIGPERL) + SV *attr_exists( const char *name ) +#endif { #if defined(SWIGRUBY) char *name; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10757 - in /trunk/sat-solver/bindings: dependency.i relation.i solvable.i
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 13:49:53 2008 New Revision: 10757 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10757&view=rev Log: Huh ? Swig cannot %alias to __cmp__ for Python ?! Modified: trunk/sat-solver/bindings/dependency.i trunk/sat-solver/bindings/relation.i trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/dependency.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dependency.i… ============================================================================== --- trunk/sat-solver/bindings/dependency.i (original) +++ trunk/sat-solver/bindings/dependency.i Tue Aug 5 13:49:53 2008 @@ -7,15 +7,15 @@ * iterating over dependency relations ('yield' in Ruby) */ +#if defined(SWIGRUBY) static int dependency_relations_iterate_callback( const Relation *rel ) { -#if defined(SWIGRUBY) /* FIXME: how to pass 'break' back to the caller ? */ rb_yield( SWIG_NewPointerObj((void*) rel, SWIGTYPE_p__Relation, 0) ); -#endif return 0; } +#endif %} Modified: trunk/sat-solver/bindings/relation.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/relation.i?r… ============================================================================== --- trunk/sat-solver/bindings/relation.i (original) +++ trunk/sat-solver/bindings/relation.i Tue Aug 5 13:49:53 2008 @@ -69,9 +69,10 @@ %alias compare "<=>"; #endif #if defined(SWIGPYTHON) - %alias compare "__cmp__"; -#endif + int __cmp__( const Relation *r ) +#else int compare( const Relation *r ) +#endif { return evrcmp( $self->pool, relation_evrid( $self ), relation_evrid( r ), EVRCMP_COMPARE ); } #if defined(SWIGRUBY) Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?r… ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Tue Aug 5 13:49:53 2008 @@ -230,9 +230,10 @@ %alias compare "<=>"; #endif #if defined(SWIGPYTHON) - %alias compare "__cmp__"; -#endif + int __cmp__( XSolvable *xs ) +#else int compare( XSolvable *xs ) +#endif { Solvable *s1 = xsolvable_solvable( $self ); Solvable *s2 = xsolvable_solvable( xs ); @@ -345,7 +346,7 @@ Solvable *s = xsolvable_solvable($self); if (repo_lookup( s, key, xsolvable_attr_lookup_callback, &result )) return result; -#if defined(SWIGPYTHON) /* needed for SWIG_Exception */ +#if defined(SWIGPYTHON) || defined(SWIGPERL)/* needed for SWIG_Exception */ fail: #endif return Swig_Null; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10756 - /trunk/sat-solver/bindings/python/tests/os11-biarch.solv
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 13:42:13 2008 New Revision: 10756 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10756&view=rev Log: sample .solv file Added: trunk/sat-solver/bindings/python/tests/os11-biarch.solv (with props) Added: trunk/sat-solver/bindings/python/tests/os11-biarch.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== Binary file - no diff available. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10755 - /trunk/sat-solver/bindings/python/tests/repodata.py
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 13:41:51 2008 New Revision: 10755 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10755&view=rev Log: repodata (extended attributes) access tests Added: trunk/sat-solver/bindings/python/tests/repodata.py Added: trunk/sat-solver/bindings/python/tests/repodata.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/repodata.py (added) +++ trunk/sat-solver/bindings/python/tests/repodata.py Tue Aug 5 13:41:51 2008 @@ -0,0 +1,47 @@ +# +# Check Repodata of Repo +# + +import unittest + +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + + +class TestSequenceFunctions(unittest.TestCase): + + def test_repo_create(self): + pool = satsolver.Pool() + assert pool + pool.set_arch("x86_64") + repo = pool.add_solv( "os11-biarch.solv" ) + repo.set_name( "openSUSE 11.0 Beta3 BiArch" ) + print "Repo ", repo.name(), " loaded with ", repo.size(), " solvables" + + print "Repo has ", repo.datasize(), " Repodatas attached" + assert repo.datasize() > 0 + assert repo.data(-1) == None + assert repo.data(repo.datasize()) == None + assert repo.data(repo.datasize()-1) + for i in range(0, repo.datasize()): + assert repo.data(i) + + repodata = repo.data(0) + assert repodata + + print "Repodata is at ", repodata.location(), " with ", repodata.keysize(), " keys" + for i in range(0, repodata.keysize()): + k = repodata.key(i) + print " Key ", k.name(), " is ", k.type(), " with ", k.size(), " bytes" + + for i in range(0, repo.size()): + s = repo.get(i) + print "Solvable %s: group %s, time %s, downloadsize %s, installsize %s" % (s, s.attr('solvable:group'), s.attr('solvable:buildtime'), s.attr('solvable:downloadsize'), s.attr('solvable:installsize')) + if i == 10: + break + +if __name__ == '__main__': + unittest.main() + -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10754 - in /trunk/sat-solver/bindings: dependency.i relation.i solvable.i
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 13:31:11 2008 New Revision: 10754 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10754&view=rev Log: add __cmp__ for Python Modified: trunk/sat-solver/bindings/dependency.i trunk/sat-solver/bindings/relation.i trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/dependency.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dependency.i… ============================================================================== --- trunk/sat-solver/bindings/dependency.i (original) +++ trunk/sat-solver/bindings/dependency.i Tue Aug 5 13:31:11 2008 @@ -69,8 +69,10 @@ Relation *get( int i ) { return dependency_relation_get( $self, i ); } +#if defined(SWIGRUBY) void each() { dependency_relations_iterate( $self, dependency_relations_iterate_callback ); } +#endif } Modified: trunk/sat-solver/bindings/relation.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/relation.i?r… ============================================================================== --- trunk/sat-solver/bindings/relation.i (original) +++ trunk/sat-solver/bindings/relation.i Tue Aug 5 13:31:11 2008 @@ -66,9 +66,12 @@ } #if defined(SWIGRUBY) - %alias cmp "<=>"; + %alias compare "<=>"; #endif - int cmp( const Relation *r ) +#if defined(SWIGPYTHON) + %alias compare "__cmp__"; +#endif + int compare( const Relation *r ) { return evrcmp( $self->pool, relation_evrid( $self ), relation_evrid( r ), EVRCMP_COMPARE ); } #if defined(SWIGRUBY) Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?r… ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Tue Aug 5 13:31:11 2008 @@ -227,9 +227,12 @@ { return xsolvable_equal( $self, xs); } #if defined(SWIGRUBY) - %alias cmp "<=>"; + %alias compare "<=>"; #endif - int cmp( XSolvable *xs ) +#if defined(SWIGPYTHON) + %alias compare "__cmp__"; +#endif + int compare( XSolvable *xs ) { Solvable *s1 = xsolvable_solvable( $self ); Solvable *s2 = xsolvable_solvable( xs ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10753 - /trunk/sat-solver/bindings/python/tests/relation.py
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 13:30:47 2008 New Revision: 10753 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10753&view=rev Log: exploring dependency relations Added: trunk/sat-solver/bindings/python/tests/relation.py Added: trunk/sat-solver/bindings/python/tests/relation.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/relation.py (added) +++ trunk/sat-solver/bindings/python/tests/relation.py Tue Aug 5 13:30:47 2008 @@ -0,0 +1,72 @@ +# +# test Relation +# +# Relations are the primary means to specify dependencies. +# Relations combine names and version through an operator. +# Relations can be compared (<=> operator) or matched (=~ operator) +# +# The following operators are defined: +# REL_GT: greater than +# REL_EQ: equals +# REL_GE: greater equal +# REL_LT: less than +# REL_NE: not equal +# REL_LE: less equal +# Future extensions (not fully defined currently) +# REL_AND: and +# REL_OR: or +# REL_WITH: with +# REL_NAMESPACE: namespace +# +# + +import unittest + +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + +class TestSequenceFunctions(unittest.TestCase): + + def setUp(self): + self.pool = satsolver.Pool() + assert self.pool + self.repo = satsolver.Repo( self.pool, "test" ) + assert self.repo + self.pool.set_arch("i686") + self.repo = self.pool.add_solv( "os11-biarch.solv" ) + assert self.repo.size() > 0 + + def test_relation_accessors(self): + rel1 = satsolver.Relation( self.pool, "A" ) + assert rel1 + assert rel1.name() == "A" + assert rel1.op() == 0 + assert rel1.evr() == None + rel2 = satsolver.Relation( self.pool, "A", satsolver.REL_EQ, "1.0-0" ) + assert rel2 + assert rel2.name() == "A" + assert rel2.op() == satsolver.REL_EQ + assert rel2.evr() == "1.0-0" + + + def test_relation(self): + rel = self.pool.create_relation( "A", satsolver.REL_EQ, "1.0-0" ) + assert rel + print "Relation: ", rel + for i in range(0, self.repo.size()): + s = self.repo.get(i) + if not s.provides().empty(): + print "%s provides %s" % (s, s.provides().get(1)) + + for j in range(0,s.provides().size()): + p = s.provides().get(j) + if p is not None: + res1 = p.cmp(rel) + print p, " cmp ", rel, " => ", res1 + res2 = p.match(rel) + print p, " match ", rel, " => ", res1 + +if __name__ == '__main__': + unittest.main() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10752 - /trunk/sat-solver/bindings/python/tests/solvable.py
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 13:09:23 2008 New Revision: 10752 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10752&view=rev Log: testing solvalbes Added: trunk/sat-solver/bindings/python/tests/solvable.py Added: trunk/sat-solver/bindings/python/tests/solvable.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/solvable.py (added) +++ trunk/sat-solver/bindings/python/tests/solvable.py Tue Aug 5 13:09:23 2008 @@ -0,0 +1,92 @@ +# +# test Solvable +# + +import unittest + +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + +# +# +#def show_dep name, deps +# return unless deps +# puts " #{deps.size} #{name}: " +# i = 0 +# while (i < deps.size) +# d = deps[i] +# puts "\t#{d.name} : #{d}" +# i += 1 +# end +# +# deps.each { |d| +# puts "\t#{d.name} #{d.op} #{d.evr}" +# } +#end + +class TestSequenceFunctions(unittest.TestCase): + + def setUp(self): + self.pool = satsolver.Pool() + assert self.pool + self.pool.set_arch("i686") + self.pool.add_solv( "os11-biarch.solv" ) + assert self.pool.size() > 0 + + def test_solvable(self): + solv = self.pool.get(2) + assert solv + print solv + print "%s-%s.%s[%s]" % (solv.name(),solv.evr(),solv.arch(),solv.vendor()) + + def test_deps(self): + return + for i in range(0,self.pool.size()): + s = self.pool.get(i) + print s + show_dep( "Provides", s.provides()) + show_dep( "Requires", s.requires()) + show_dep( "Obsoletes", s.obsoletes()) + show_dep( "Conflicts", s.conflicts()) + + + def test_creation(self): + repo = self.pool.create_repo( 'test' ) + assert repo + solv1 = repo.create_solvable( 'one', '1.0-0' ) + assert solv1 + assert repo.size() == 1 + assert solv1.name() == 'one' + assert solv1.evr() == "1.0-0" + assert solv1.vendor() == None + solv2 = satsolver.Solvable( repo, 'two', '2.0-0', 'noarch' ) + assert solv2 + assert repo.size() == 2 + assert solv2.name() == 'two' + assert solv2.evr() == "2.0-0" + solv2.set_vendor("Ruby") + assert solv2.vendor() == "Ruby" + + rel = satsolver.Relation( self.pool, "two", satsolver.REL_GE, "2.0-0" ) + assert rel + solv1.requires().add(rel) + assert solv1.requires().size() == 1 + + transaction = self.pool.create_transaction() + transaction.install( solv1 ) + + solver = self.pool.create_solver( self.pool.create_repo( "system" ) ) +# self.pool.debug = 255 + solver.solve( transaction ) +# solver.each_to_install { |s| +# puts "Install #{s}" +# } +# solver.each_to_remove { |s| +# puts "Remove #{s}" +# } + + +if __name__ == '__main__': + unittest.main() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10751 - /trunk/sat-solver/bindings/python/tests/rpmdb.py
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 12:52:21 2008 New Revision: 10751 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10751&view=rev Log: getting installed packages Added: trunk/sat-solver/bindings/python/tests/rpmdb.py Added: trunk/sat-solver/bindings/python/tests/rpmdb.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/rpmdb.py (added) +++ trunk/sat-solver/bindings/python/tests/rpmdb.py Tue Aug 5 12:52:21 2008 @@ -0,0 +1,45 @@ +# +# Load repository from rpm database +# +# repo = pool.add_rpmdb( "/root/dir/of/system" ) +# will create an unnamed repository by reading the rpm database +# and create a solvable for each installed package. +# Use +# repo.name = "..." +# to name the repository +# +# + +import unittest + +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + +class TestSequenceFunctions(unittest.TestCase): + + def test_rpmdb(self): + pool = satsolver.Pool() + assert pool + pool.set_arch("i686") + repo = pool.add_rpmdb( "/" ) + assert repo.size() > 0 + print repo.size(), " installed packages" + + name = None + for i in range(0, pool.size()): + s = pool.get(i) + print s + if i == 7: + name = s.name() + i += 1 + if i > 10: + break + + s = pool.find( name ) + print "Seventh: ", name, " -> ", s + + +if __name__ == '__main__': + unittest.main() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0