URL: https://github.com/freeipa/freeipa/pull/197
Author: tiran
Title: #197: Make setup.py files PyPI compatible
Action: opened
PR body:
"""
- Use PEP 440 compatible version schema
- Use correct classifiers
Signed-off-by: Christian Heimes <chei...@redhat.com>
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/197/head:pr197
git checkout pr197
From d97dc1c51159dacf89064b060745818e019252f7 Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Mon, 31 Oct 2016 09:19:15 +0100
Subject: [PATCH] Make setup.py files PyPI compatible
- Use PEP 440 compatible version schema
- Use correct classifiers
Signed-off-by: Christian Heimes <chei...@redhat.com>
---
ipasetup.py.in | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/ipasetup.py.in b/ipasetup.py.in
index f291d22..a6cc8b1 100644
--- a/ipasetup.py.in
+++ b/ipasetup.py.in
@@ -18,9 +18,19 @@
import os
import sys
+VERSION = "__VERSION__"
+
+if 'GIT' in VERSION:
+ # convert FreeIPA version scheme into PEP 440 version
+ # 4.4.90.201610281620GITd0c17b4
+ # 4.4.90.dev201610281620+gitd0c17b4
+ prefix, suffix = VERSION.rsplit('.', 1)
+ year, githash = suffix.split('GIT')
+ VERSION = "{}.dev{}+git{}".format(prefix, year, githash)
+
common_args = dict(
- version="__VERSION__",
- license="GPL",
+ version=VERSION,
+ license="GPLv3+",
author="FreeIPA Developers",
author_email="freeipa-devel@redhat.com",
maintainer="FreeIPA Developers",
@@ -30,14 +40,21 @@ common_args = dict(
platforms=["Linux", "Solaris", "Unix"],
classifiers=[
"Development Status :: 5 - Production/Stable",
- ("Topic :: System :: Systems Administration :: "
- "Authentication/Directory :: LDAP"),
- "Topic :: Internet :: Name Service (DNS)",
- "Intended Audience :: System Environment/Base",
- "License :: GPL",
- "Programming Language :: Python",
+ "Intended Audience :: System Administrators",
+ ("License :: OSI Approved :: "
+ "GNU General Public License v3 or later (GPLv3+)"),
+ "Programming Language :: C",
+ "Programming Language :: Python :: 2",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: Implementation :: CPython",
"Operating System :: POSIX",
+ "Operating System :: POSIX :: Linux",
"Operating System :: Unix",
+ "Topic :: Internet :: Name Service (DNS)",
+ ("Topic :: System :: Systems Administration :: "
+ "Authentication/Directory :: LDAP"),
],
)
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
