Port all setup.py files to setuptools #132

tiran · 2016-10-04T12:48:04Z

PREVIEW, please don't merge yet.

This is my take on FreeIPA's setup.py files. I have moved all common code and constants into ipasetup.py.in and converted all setup.py.in to setup.py. Setup now uses setuptools instead of distutils. I had to move ipa.1 man page to client/man because setuptools does no longer support data_files.

Signed-off-by: Christian Heimes cheimes@redhat.com

MartinBasti · 2016-10-05T12:12:22Z

ipasetup.py.in

+    download_url="http://www.freeipa.org/page/Downloads",
+    platforms=["Linux", "Solaris", "Unix"],
+    classifiers=[
+        "Development Status :: 4 - Beta",


Maybe we can change this to anything else than beta :D

hub am #132
Applying: Draft for a new setup.py
.git/rebase-apply/patch:316: new blank line at EOF.
+
warning: 1 line adds whitespace errors.

Also please fix this

MartinBasti · 2016-10-06T08:54:10Z

This WIP works for me, I like that we get rid of setup.py.in files.

I'm looking forward to final version

Please fix PEP8 reported error and my inline comments

tiran · 2016-10-06T13:38:54Z

@mbasti-rh I have removed more hacks and made each setup.py even simpler.

HonzaCholasta · 2016-10-10T06:38:13Z

.gitignore

@@ -41,6 +41,9 @@ freeipa2-dev-doc
 /dist/
 /RELEASE
 /rpmbuild/
+# Build
+ipasetup.py


Why is ipasetup.py ignored?

Makefile autogenerates the file from ipasetup.py.in.

slaps forehead Right.

HonzaCholasta · 2016-10-10T06:42:10Z

Makefile

+	for directory in ipaclient ipalib ipaplatform ipapython ipatests; do \
+	    pushd $${directory} ; \
+	    cp ../ipasetup.py . ; \
+	    $(PYTHON) setup.py egg_info ; \


IMO it would be better to run setup.py with PYTHONPATH set properly, rather than copy ipasetup.py all the time.

With a copy of ipasetup.py there are no build dependencies between the packages. I can simple chdir into a directory and run python setup.py install.

Alternatively, if sys.path was updated appropriately in each setup.py, we would get rid of copying and allow chdir & run setup.py.

HonzaCholasta · 2016-10-10T06:45:56Z

client/man/Makefile.am

@@ -10,7 +10,8 @@ man1_MANS = 				\
 		ipa-client-install.1	\
 		ipa-client-automount.1	\
 		ipa-certupdate.1	\
-		ipa-join.1
+		ipa-join.1		\
+		ipa.1


Either put the ipa.1 packaging change in a separate commit, or don't do it at all (there must be some way to package custom file with setuptools, right?)

No, setuptools no longer supports non-package data. It can no longer install files to PREFIX/share, PREFIX/man or any other directory except for scripts (PREFIX/share) and package data.

I'm going to move the change to a separate commit.

MartinBasti · 2016-10-11T17:00:32Z

I cannot reinstall packages using your commits

dnf reinstall <IPA*>.rpm
...
Error: Transaction check error:
  file /usr/lib/python2.7/site-packages/ipalib-4.4.90-py2.7.egg-info from install of python2-ipalib-4.4.90-0.fc24.noarch conflicts with file from package python2-ipalib-4.4.90-0.fc24.noarch
  file /usr/lib/python2.7/site-packages/ipaplatform-4.4.90-py2.7.egg-info from install of python2-ipalib-4.4.90-0.fc24.noarch conflicts with file from package python2-ipalib-4.4.90-0.fc24.noarch
  file /usr/lib/python2.7/site-packages/ipapython-4.4.90-py2.7.egg-info from install of python2-ipalib-4.4.90-0.fc24.noarch conflicts with file from package python2-ipalib-4.4.90-0.fc24.noarch
  file /usr/lib/python2.7/site-packages/ipaclient-4.4.90-py2.7.egg-info from install of python2-ipaclient-4.4.90-0.fc24.noarch conflicts with file from package python2-ipaclient-4.4.90-0.fc24.noarch
  file /usr/lib/python3.5/site-packages/ipalib-4.4.90-py3.5.egg-info from install of python3-ipalib-4.4.90-0.fc24.noarch conflicts with file from package python3-ipalib-4.4.90-0.fc24.noarch
  file /usr/lib/python3.5/site-packages/ipaplatform-4.4.90-py3.5.egg-info from install of python3-ipalib-4.4.90-0.fc24.noarch conflicts with file from package python3-ipalib-4.4.90-0.fc24.noarch
  file /usr/lib/python3.5/site-packages/ipapython-4.4.90-py3.5.egg-info from install of python3-ipalib-4.4.90-0.fc24.noarch conflicts with file from package python3-ipalib-4.4.90-0.fc24.noarch
  file /usr/lib/python3.5/site-packages/ipaclient-4.4.90-py3.5.egg-info from install of python3-ipaclient-4.4.90-0.fc24.noarch conflicts with file from package python3-ipaclient-4.4.90-0.fc24.noarch
  file /usr/lib/python3.5/site-packages/ipatests-4.4.90-py3.5.egg-info from install of python3-ipatests-4.4.90-0.fc24.noarch conflicts with file from package python3-ipatests-4.4.90-0.fc24.noarch
  file /usr/lib/python2.7/site-packages/ipatests-4.4.90-py2.7.egg-info from install of python2-ipatests-4.4.90-0.fc24.noarch conflicts with file from package python2-ipatests-4.4.90-0.fc24.noarch

tiran · 2016-10-18T08:10:32Z

@mbasti-rh I can't reproduce your problem. dnf reinstall works for me. I tested both upgrades from 4.4.2 and reinstall of my RPMs.

HonzaCholasta · 2016-10-19T11:21:17Z

MANIFEST.in

@@ -1,2 +1 @@
-include COPYING TODO lite-server.py
-include tests/*/*.py
+include COPYING lite-server.py


Where is this manifest file used? Can't we just drop it? I think it at least should not include lite-server.py.

The file ipapython/ipa.conf is no longer used and not installed. Signed-off-by: Christian Heimes <cheimes@redhat.com>

tiran · 2016-10-20T10:09:27Z

The PR is no longer provisional and ready-to-merge.

HonzaCholasta · 2016-10-20T11:30:12Z

setup.py

    version=ipalib.__version__,
-    license='GPLv3+',
-    url='http://freeipa.org/',
+    scripts=['ipa'],


The ipa script is in fact a client script, so I guess it shouldn't be packaged with ipaserver.

Should the script be installed by ipalib or ipaclient? It's a client script but the actual code is in ipalib.

HonzaCholasta · 2016-10-20T11:56:59Z

LGTM, but shouldn't we also move /setup.py to /ipaserver/setup.py?

All setup.py files are now using setuptools through a common file ipasetup.py. The file is auto-generated and contain all common settings. Signed-off-by: Christian Heimes <cheimes@redhat.com>

tiran · 2016-10-20T14:24:17Z

I have moved /setup.py into /ipaserver/, fixed some make distclean targets (they were still removing setup.py) and made /ipaclient/setup.u install the ipa script. make rpms is passing.

pspacek · 2016-10-20T15:37:49Z

Jenkins does not complain. ACK.

pvoborni · 2016-10-20T16:44:23Z

Fixed upstream
master:
https://fedorahosted.org/freeipa/changeset/4cd83fb51cc35a2ba7773b62a7aa8d295a1e1e4a
https://fedorahosted.org/freeipa/changeset/e12a70a8b1aa5daac4b8ab7ac681b09f664a8357

MartinBasti reviewed Oct 5, 2016

View reviewed changes

tiran force-pushed the new_setup branch from 2ac323e to 0e2692d Compare October 6, 2016 13:34

HonzaCholasta reviewed Oct 10, 2016

View reviewed changes

tiran force-pushed the new_setup branch from 0e2692d to c23f7ac Compare October 17, 2016 16:02

HonzaCholasta reviewed Oct 19, 2016

View reviewed changes

tiran force-pushed the new_setup branch 6 times, most recently from 6a6cdf9 to 4c59f8a Compare October 20, 2016 09:54

Remove ipapython/ipa.conf

3c8ae8e

The file ipapython/ipa.conf is no longer used and not installed. Signed-off-by: Christian Heimes <cheimes@redhat.com>

tiran mentioned this pull request Oct 20, 2016

Remove ipapython/ipa.conf #175

Closed

tiran force-pushed the new_setup branch from 4c59f8a to 2982ce5 Compare October 20, 2016 10:05

tiran changed the title ~~Draft for a new setup.py (WIP)~~ Port all setup.py files to setuptools Oct 20, 2016

HonzaCholasta reviewed Oct 20, 2016

View reviewed changes

Port all setup.py to setuptools

b282bb2

All setup.py files are now using setuptools through a common file ipasetup.py. The file is auto-generated and contain all common settings. Signed-off-by: Christian Heimes <cheimes@redhat.com>

tiran force-pushed the new_setup branch from 2982ce5 to b282bb2 Compare October 20, 2016 14:22

pspacek self-assigned this Oct 20, 2016

pspacek added the ack Pull Request approved, can be merged label Oct 20, 2016

pvoborni added the pushed Pull Request has already been pushed label Oct 20, 2016

pvoborni closed this Oct 20, 2016

tiran deleted the new_setup branch October 24, 2016 06:58

Port all setup.py files to setuptools #132

Port all setup.py files to setuptools #132

tiran commented Oct 4, 2016 •

edited by pvoborni

MartinBasti Oct 5, 2016

MartinBasti Oct 6, 2016

MartinBasti commented Oct 6, 2016

tiran commented Oct 6, 2016

HonzaCholasta Oct 10, 2016

tiran Oct 17, 2016

HonzaCholasta Oct 19, 2016

HonzaCholasta Oct 10, 2016

tiran Oct 17, 2016

HonzaCholasta Oct 19, 2016

HonzaCholasta Oct 10, 2016 •

edited

tiran Oct 17, 2016

tiran Oct 17, 2016

MartinBasti commented Oct 11, 2016

tiran commented Oct 18, 2016

HonzaCholasta Oct 19, 2016

tiran commented Oct 20, 2016

HonzaCholasta Oct 20, 2016

tiran Oct 20, 2016

HonzaCholasta commented Oct 20, 2016

tiran commented Oct 20, 2016

pspacek commented Oct 20, 2016

pvoborni commented Oct 20, 2016

Port all setup.py files to setuptools #132

Port all setup.py files to setuptools #132

Conversation

tiran commented Oct 4, 2016 • edited by pvoborni

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartinBasti commented Oct 6, 2016

tiran commented Oct 6, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HonzaCholasta Oct 10, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartinBasti commented Oct 11, 2016

tiran commented Oct 18, 2016

Choose a reason for hiding this comment

tiran commented Oct 20, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HonzaCholasta commented Oct 20, 2016

tiran commented Oct 20, 2016

pspacek commented Oct 20, 2016

pvoborni commented Oct 20, 2016

tiran commented Oct 4, 2016 •

edited by pvoborni

HonzaCholasta Oct 10, 2016 •

edited