[CalendarServer-changes] [12478] CalendarServer/trunk/setup.py

[source_changes at macosforge.org]

Revision: 12478
          http://trac.calendarserver.org//changeset/12478
Author:   wsanchez at apple.com
Date:     2014-01-30 10:18:27 -0800 (Thu, 30 Jan 2014)
Log Message:
-----------
Reqs need py_ prefix now.

Modified Paths:
--------------
    CalendarServer/trunk/setup.py

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2014-01-30 18:04:08 UTC (rev 12477)
+++ CalendarServer/trunk/setup.py	2014-01-30 18:18:27 UTC (rev 12478)
@@ -137,16 +137,16 @@
 
 setup_requirements = []
 
-install_requirements = read_requirements("base.txt")
+install_requirements = read_requirements("py_base.txt")
 
 extras_requirements = dict(
     (reqs_filename[4:-4], read_requirements(reqs_filename))
     for reqs_filename in listdir(requirements_dir)
-    if reqs_filename.startswith("opt_") and reqs_filename.endswith(".txt")
+    if reqs_filename.startswith("py_opt_") and reqs_filename.endswith(".txt")
 )
 
 # Requirements for development and testing
-develop_requirements = read_requirements("develop.txt")
+develop_requirements = read_requirements("py_develop.txt")
 
 if environment.get("CALENDARSERVER_DEVELOP", "false") == "true":
     install_requirements.extend(develop_requirements)
@@ -182,6 +182,7 @@
         dirname(__file__), "calendarserver", "version.py"
     )
     version_file = file(version_filename, "w")
+
     try:
         version_file.write(
             'version = "{0}"\n\n'.format(version_string)
@@ -189,9 +190,6 @@
     finally:
         version_file.close()
 
-
-
-
     dist = setup(
         name="CalendarServer",
         version=version_string,
@@ -325,5 +323,9 @@
             newScript.close()
 
 
+#
+# Main
+#
+
 if __name__ == "__main__":
     doSetup()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/af83caaa/attachment.html>