public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gentoopm:master commit in: /
@ 2011-08-13 10:58 Michał Górny
  2011-08-12 21:21 ` [gentoo-commits] proj/gentoopm:0.2.x " Michał Górny
  0 siblings, 1 reply; 4+ messages in thread
From: Michał Górny @ 2011-08-13 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     b9fb58a462d27fdf4e66d6d5b88c8ad9697df1b1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 21:22:13 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 21:22:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=b9fb58a4

Merge branch 'master' into 0.2.x

Conflicts:
	gentoopm/basepm/metadata.py
	gentoopm/basepm/pkg.py
	gentoopm/paludispm/pkg.py
	gentoopm/pkgcorepm/pkg.py
	gentoopm/portagepm/pkg.py


 gentoopm/__init__.py           |    6 ++--
 gentoopm/basepm/__init__.py    |   14 +++++++-
 gentoopm/basepm/atom.py        |    2 +-
 gentoopm/basepm/config.py      |    2 +-
 gentoopm/basepm/contents.py    |    2 +-
 gentoopm/basepm/depend.py      |    2 +-
 gentoopm/basepm/environ.py     |    2 +-
 gentoopm/basepm/filter.py      |   65 +++++++++++++++++++++++++++++++++++++++-
 gentoopm/basepm/pkg.py         |   13 +++-----
 gentoopm/basepm/pkgset.py      |   20 ++++++++----
 gentoopm/basepm/repo.py        |    5 ++-
 gentoopm/basepm/stack.py       |    4 +-
 gentoopm/bash/__init__.py      |    2 +-
 gentoopm/bash/bashserver.py    |    5 ++-
 gentoopm/filters.py            |   20 ++++++++++++
 gentoopm/matchers.py           |   44 +++++++++++++++++++++++++++
 gentoopm/paludispm/__init__.py |   14 +++++---
 gentoopm/paludispm/atom.py     |    4 +-
 gentoopm/paludispm/config.py   |    2 +-
 gentoopm/paludispm/contents.py |    3 +-
 gentoopm/paludispm/depend.py   |    5 ++-
 gentoopm/paludispm/pkg.py      |   14 ++++----
 gentoopm/paludispm/pkgset.py   |    7 ++--
 gentoopm/paludispm/repo.py     |   10 +++---
 gentoopm/pkgcorepm/__init__.py |   15 ++++++---
 gentoopm/pkgcorepm/atom.py     |    4 +-
 gentoopm/pkgcorepm/config.py   |    2 +-
 gentoopm/pkgcorepm/contents.py |    2 +-
 gentoopm/pkgcorepm/depend.py   |    5 ++-
 gentoopm/pkgcorepm/filter.py   |    4 +-
 gentoopm/pkgcorepm/pkg.py      |   13 ++++----
 gentoopm/pkgcorepm/repo.py     |    9 +++--
 gentoopm/portagepm/__init__.py |   15 ++++++---
 gentoopm/portagepm/atom.py     |    4 +-
 gentoopm/portagepm/config.py   |    2 +-
 gentoopm/portagepm/contents.py |    3 +-
 gentoopm/portagepm/depend.py   |    2 +-
 gentoopm/portagepm/pkg.py      |   15 +++++----
 gentoopm/portagepm/repo.py     |   19 ++++++++----
 gentoopm/querycli.py           |   30 +++++++++++++++++-
 gentoopm/submodules.py         |    8 ++--
 gentoopm/tests/atom.py         |    5 ++-
 gentoopm/tests/config.py       |    2 +-
 gentoopm/tests/pkg.py          |    2 +-
 gentoopm/tests/psets.py        |    7 ++--
 gentoopm/tests/repo.py         |    2 +-
 46 files changed, 316 insertions(+), 121 deletions(-)

diff --cc gentoopm/basepm/pkg.py
index da0a346,4a17335..a0bf73b
--- a/gentoopm/basepm/pkg.py
+++ b/gentoopm/basepm/pkg.py
@@@ -137,11 -136,29 +137,8 @@@ class PMPackage(PMAtom, FillMissingComp
  			else:
  				raise ValueError('Incorrect positional argument: %s' % f)
  
- 		for k, m in kwargs.items():
- 			raise KeyError('Unmatched keyword argument: %s' % k)
- 
  		return True
  
 -	@property
 -	def id(self):
 -		"""
 -		An unique identifier for the package.
 -
 -		@type: hashable
 -		@deprecated: use the package itself or its C{hash()} instead
 -		"""
 -		return self
 -
 -	@property
 -	def atom(self):
 -		"""
 -		Return an atom matching the package uniquely.
 -
 -		@type: L{PMAtom}
 -		@deprecated: the package is now a subclass of L{PMAtom}
 -			and can be used directly as an atom
 -		"""
 -		return self
 -
  	@abstractproperty
  	def path(self):
  		"""
diff --cc gentoopm/paludispm/pkg.py
index 8f9ba80,a3a988c..784be26
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@@ -5,15 -5,16 +5,15 @@@
  
  import paludis
  
- from gentoopm.basepm.depend import PMRequiredUseAtom
- from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \
+ from ..basepm.depend import PMRequiredUseAtom
 -from ..basepm.metadata import PMPackageMetadata
+ from ..basepm.pkg import PMPackage, PMPackageDescription, \
  		PMInstallablePackage, PMInstalledPackage, PMBoundPackageKey, \
  		PMPackageState, PMUseFlag
- from gentoopm.paludispm.atom import PaludisAtom, \
- 		PaludisPackageKey, PaludisPackageVersion
- from gentoopm.paludispm.contents import PaludisPackageContents
- from gentoopm.paludispm.depend import PaludisPackageDepSet
- from gentoopm.util import SpaceSepFrozenSet, SpaceSepTuple
+ from ..util import SpaceSepFrozenSet, SpaceSepTuple
+ 
+ from .atom import PaludisAtom, PaludisPackageKey, PaludisPackageVersion
+ from .contents import PaludisPackageContents
+ from .depend import PaludisPackageDepSet
  
  class PaludisBoundPackageKey(PaludisPackageKey, PMBoundPackageKey):
  	def __init__(self, key, pkg):
diff --cc gentoopm/pkgcorepm/pkg.py
index 00a2c1f,adc0c6d..8a1fcbf
--- a/gentoopm/pkgcorepm/pkg.py
+++ b/gentoopm/pkgcorepm/pkg.py
@@@ -3,14 -3,16 +3,15 @@@
  # (c) 2011 Michał Górny <mgorny@gentoo.org>
  # Released under the terms of the 2-clause BSD license.
  
- from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \
 -from ..basepm.metadata import PMPackageMetadata
+ from ..basepm.pkg import PMPackage, PMPackageDescription, \
  		PMInstalledPackage, PMInstallablePackage, PMBoundPackageKey, \
  		PMPackageState, PMUseFlag
- from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet
- from gentoopm.pkgcorepm.atom import PkgCoreAtom, PkgCorePackageKey
- from gentoopm.pkgcorepm.contents import PkgCorePackageContents
- from gentoopm.pkgcorepm.depend import PkgCorePackageDepSet
- from gentoopm.util import SpaceSepTuple, SpaceSepFrozenSet
+ from ..basepm.pkgset import PMPackageSet, PMFilteredPackageSet
+ from ..util import SpaceSepTuple, SpaceSepFrozenSet
+ 
+ from .atom import PkgCoreAtom, PkgCorePackageKey
+ from .contents import PkgCorePackageContents
+ from .depend import PkgCorePackageDepSet
  
  class PkgCorePackageSet(PMPackageSet):
  	def filter(self, *args, **kwargs):
diff --cc gentoopm/portagepm/pkg.py
index a0a6746,5992ae2..8f73ea0
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@@ -5,16 -5,18 +5,17 @@@
  
  from portage.versions import cpv_getkey, cpv_getversion, vercmp
  
- from gentoopm.basepm.depend import PMRequiredUseAtom
- from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \
+ from ..basepm.depend import PMRequiredUseAtom
 -from ..basepm.metadata import PMPackageMetadata
+ from ..basepm.pkg import PMPackage, PMPackageDescription, \
  		PMInstalledPackage, PMInstallablePackage, PMBoundPackageKey, \
  		PMPackageState, PMUseFlag
- from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet
- from gentoopm.portagepm.atom import PortageAtom, CompletePortageAtom, \
+ from ..basepm.pkgset import PMPackageSet, PMFilteredPackageSet
+ from ..util import SpaceSepTuple, SpaceSepFrozenSet
+ 
+ from .atom import PortageAtom, CompletePortageAtom, \
  		PortagePackageKey, PortagePackageVersion, _get_atom
- from gentoopm.portagepm.contents import PortagePackageContents
- from gentoopm.portagepm.depend import PortagePackageDepSet
- from gentoopm.util import SpaceSepTuple, SpaceSepFrozenSet
+ from .contents import PortagePackageContents
+ from .depend import PortagePackageDepSet
  
  class PortagePackageSet(PMPackageSet):
  	def filter(self, *args, **kwargs):



^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoopm:master commit in: /
@ 2011-08-13 10:58 Michał Górny
  2011-08-13 10:33 ` [gentoo-commits] proj/gentoopm:0.2.x " Michał Górny
  0 siblings, 1 reply; 4+ messages in thread
From: Michał Górny @ 2011-08-13 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     156b87415489d41751b3666733418765b6209733
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 10:33:13 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 10:33:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=156b8741

Merge branch 'master' into 0.2.x


 gentoopm/__init__.py      |    2 +-
 gentoopm/basepm/filter.py |    5 ++---
 gentoopm/basepm/pkgset.py |    4 +++-
 gentoopm/paludispm/pkg.py |    5 +++--
 gentoopm/portagepm/pkg.py |   12 ++++++------
 gentoopm/querycli.py      |   16 ++++++++++++++--
 setup.py                  |    4 ++--
 7 files changed, 31 insertions(+), 17 deletions(-)



^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoopm:gentoopm-0.2 commit in: /
@ 2011-08-13 10:57 Michał Górny
  2011-08-13 10:57 ` [gentoo-commits] proj/gentoopm:0.2.x " Michał Górny
  0 siblings, 1 reply; 4+ messages in thread
From: Michał Górny @ 2011-08-13 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     82ca014365940369148c31611d8977e66af9e9fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 10:58:56 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 10:58:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=82ca0143

Merge branch 'master' into 0.2.x


 gentoopm/paludispm/pkg.py |    5 ++---
 gentoopm/portagepm/pkg.py |    7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)



^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-13 10:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-13 10:58 [gentoo-commits] proj/gentoopm:master commit in: / Michał Górny
2011-08-12 21:21 ` [gentoo-commits] proj/gentoopm:0.2.x " Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2011-08-13 10:58 [gentoo-commits] proj/gentoopm:master " Michał Górny
2011-08-13 10:33 ` [gentoo-commits] proj/gentoopm:0.2.x " Michał Górny
2011-08-13 10:57 [gentoo-commits] proj/gentoopm:gentoopm-0.2 " Michał Górny
2011-08-13 10:57 ` [gentoo-commits] proj/gentoopm:0.2.x " Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox