On Mon, Jan 24, 2011 at 04:06:22PM -0500, Stephen Gallagher wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Fixes https://fedorahosted.org/sssd/ticket/759 > > Note: This change will alter how consumers import the SSSD API. > > e.g. > import SSSDConfig > is now > import sssd.SSSDConfig > > Projects like authconfig would need to be updated with this change.
The patch works as expected, but I have to admit I do not know much about python packages. Currently the supplied spec file creates an rpm with the following python related files: /usr/lib/python2.7/site-packages/pysss.so /usr/lib/python2.7/site-packages/sssd-1-py2.7.egg-info /usr/lib/python2.7/site-packages/sssd/SSSDConfig.py /usr/lib/python2.7/site-packages/sssd/SSSDConfig.pyc /usr/lib/python2.7/site-packages/sssd/SSSDConfigTest.py /usr/lib/python2.7/site-packages/sssd/SSSDConfigTest.pyc /usr/lib/python2.7/site-packages/sssd/ipachangeconf.py /usr/lib/python2.7/site-packages/sssd/ipachangeconf.pyc /usr/lib/python2.7/site-packages/sssd/sssd_upgrade_config.py /usr/lib/python2.7/site-packages/sssd/sssd_upgrade_config.pyc I have the following question: - should pysss.so be in the sssd directory, too ? - do we still need the egg file? - do we need sssd/__init__.* files ? bye, Sumit > > - -- > Stephen Gallagher > RHCE 804006346421761 > > Delivering value year after year. > Red Hat ranks #1 in value among software vendors. > http://www.redhat.com/promo/vendor/ > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ > > iEYEARECAAYFAk096c4ACgkQeiVVYja6o6PVFACgoRiS1V9B3V5mgdgvzt2Fl7kw > nlAAn0Q2AFn9wFbJaooPl2kTvnb0gsds > =jBRm > -----END PGP SIGNATURE----- > From b7319dc5d2f3a6af150879d7e22592916499ff47 Mon Sep 17 00:00:00 2001 > From: Stephen Gallagher <sgall...@redhat.com> > Date: Mon, 24 Jan 2011 16:01:40 -0500 > Subject: [PATCH] Install SSSD python files in a package > > --- > Makefile.am | 10 +++++----- > contrib/sssd.spec.in | 2 +- > po/POTFILES.in | 2 +- > src/config/setup.py | 8 ++------ > src/config/{ => sssd}/SSSDConfig.py | 0 > src/config/{ => sssd}/SSSDConfigTest.py | 2 +- > src/config/{ => sssd}/ipachangeconf.py | 0 > src/config/{ => sssd}/sssd_upgrade_config.py | 0 > 8 files changed, 10 insertions(+), 14 deletions(-) > rename src/config/{ => sssd}/SSSDConfig.py (100%) > rename src/config/{ => sssd}/SSSDConfigTest.py (99%) > rename src/config/{ => sssd}/ipachangeconf.py (100%) > rename src/config/{ => sssd}/sssd_upgrade_config.py (100%) > > diff --git a/Makefile.am b/Makefile.am > index > 49520f3bea96c1f07966a44b7537295564b09dca..182a62b0f517779717787316c7d6febffad73e45 > 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -88,7 +88,7 @@ check_PROGRAMS = \ > PYTHON_TESTS = > > if BUILD_PYTHON_BINDINGS > -PYTHON_TESTS += $(srcdir)/src/config/SSSDConfigTest.py > +PYTHON_TESTS += $(srcdir)/src/config/sssd/SSSDConfigTest.py > endif > > TESTS = \ > @@ -142,10 +142,10 @@ endif > dist_noinst_SCRIPTS = \ > $(EXTRA_SCRIPTS) \ > src/config/setup.py \ > - src/config/ipachangeconf.py \ > - src/config/SSSDConfig.py \ > - src/config/SSSDConfigTest.py \ > - src/config/sssd_upgrade_config.py > + src/config/sssd/ipachangeconf.py \ > + src/config/sssd/SSSDConfig.py \ > + src/config/sssd/SSSDConfigTest.py \ > + src/config/sssd/sssd_upgrade_config.py > > dist_noinst_DATA = \ > src/config/testconfigs/sssd-valid.conf \ > diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in > index > e1768b2ae5122fa5b6e70fb57f1cf0f2ccb19ca4..11a964f875115f11e8484bd43cd35a4312483434 > 100644 > --- a/contrib/sssd.spec.in > +++ b/contrib/sssd.spec.in > @@ -197,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT > %{_mandir}/man5/sssd-simple.5* > %{_mandir}/man8/sssd.8* > %{python_sitearch}/pysss.so > -%{python_sitelib}/*.py* > +%{python_sitelib}/sssd/*.py* > > %lang(cs) %{_mandir}/cs/man[58]/* > %lang(uk) %{_mandir}/uk/man[58]/* > diff --git a/po/POTFILES.in b/po/POTFILES.in > index > 0c09e253d3c5a0ae606e9741552ae6a0f8898220..6b9deb88d7d86585b5fbd7affe6988d12aa05671 > 100644 > --- a/po/POTFILES.in > +++ b/po/POTFILES.in > @@ -1,6 +1,6 @@ > # List of source files which contain translatable strings. > src/confdb/confdb_setup.c > -src/config/SSSDConfig.py > +src/config/sssd/SSSDConfig.py > src/monitor/monitor.c > src/providers/krb5/krb5_child.c > src/providers/ldap/ldap_child.c > diff --git a/src/config/setup.py b/src/config/setup.py > index > 16cc54070651e66ea3286fe70314167fc6ca46b5..d4d26c3d410425c445687b0efd35f26f9444d422 > 100644 > --- a/src/config/setup.py > +++ b/src/config/setup.py > @@ -24,13 +24,9 @@ Python-level packaging using distutils. > from distutils.core import setup > > setup( > - name='SSSDConfig', > + name='sssd', > version='1', > license='GPLv3+', > url='http://fedorahosted.org/sssd', > - py_modules=[ > - 'SSSDConfig', > - 'ipachangeconf', > - 'sssd_upgrade_config', > - ], > + packages=['sssd'], > ) > diff --git a/src/config/SSSDConfig.py b/src/config/sssd/SSSDConfig.py > similarity index 100% > rename from src/config/SSSDConfig.py > rename to src/config/sssd/SSSDConfig.py > diff --git a/src/config/SSSDConfigTest.py b/src/config/sssd/SSSDConfigTest.py > similarity index 99% > rename from src/config/SSSDConfigTest.py > rename to src/config/sssd/SSSDConfigTest.py > index > 60fb0a2443a7f51ada8575bca1cf934f262b3bc1..bfe49a87e7f47ada8abf20833606bb37c4640871 > 100755 > --- a/src/config/SSSDConfigTest.py > +++ b/src/config/sssd/SSSDConfigTest.py > @@ -1629,7 +1629,7 @@ if __name__ == "__main__": > if srcdir: > srcdir = srcdir + "/src/config" > else: > - srcdir = "." > + srcdir = ".." > > suite = > unittest.TestLoader().loadTestsFromTestCase(SSSDConfigTestSSSDService) > res = unittest.TextTestRunner().run(suite) > diff --git a/src/config/ipachangeconf.py b/src/config/sssd/ipachangeconf.py > similarity index 100% > rename from src/config/ipachangeconf.py > rename to src/config/sssd/ipachangeconf.py > diff --git a/src/config/sssd_upgrade_config.py > b/src/config/sssd/sssd_upgrade_config.py > similarity index 100% > rename from src/config/sssd_upgrade_config.py > rename to src/config/sssd/sssd_upgrade_config.py > -- > 1.7.3.4 > > _______________________________________________ > sssd-devel mailing list > sssd-devel@lists.fedorahosted.org > https://fedorahosted.org/mailman/listinfo/sssd-devel _______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/sssd-devel
