Commits

Derek Mannheim committed 3c058ae

Changed to v1.0.0.0 for upload to PyPi.

  • Participants
  • Parent commits e7e02a7
  • Tags r1, v1.0.0.0 1
    1. v1.0.0.0-r1

Comments (0)

Files changed (3)

+include COPYING
+include *.txt
+include ez_setup.py
 recursive-include src/tome/res *.*
 recursive-include src/tome/doc *.*
 You should have received a copy of the GNU Affero General Public License
 along with Tome.  If not, see <http://www.gnu.org/licenses/>.
 """
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, find_packages
-import sys
-import os
-import cStringIO
-
-
-### This is a lot of screwing around to populate the README for the package from
-# a template we have in the templ directory.
-sys.path.insert(0, "src/tome")
-import version
-
-
-setup(
-    name='tome',
-    version=version.setuptools_string(),
-    description='Tome Markup Language for authors.',
-    author='Brian Mearns',
-    author_email='bmearns@ieee.org',
-    url='https://bitbucket.org/bmearns/tome/',
-    license='LICENSE.txt',
-
-    install_requires=["templ>=1.0"],
-
-    package_dir={'': 'src'},
-    packages=find_packages('src'),  #Looks for __init__.py
-    include_package_data = True,    #Uses MANIFEST.in
-    data_files = [
-        ('misc', ['LICENSE.txt', 'README.txt', 'TODO.txt', 'BUGS.txt', 'CHANGES.txt']),
-        ('res', ['res/tome.xsd',])
-    ],
-
-
-    entry_points = {
-        "console_scripts" : [
-            'tome = tome.main:main',
-            'tome-epub-template = tome.main:writeEpubTemplate',
-            'tome-latex-template = tome.main:writeLatexTemplate',
-            'tome-xml-schema = tome.main:writeXmlSchema',
-        ],
-    }
-)
-
+import ez_setup
+ez_setup.use_setuptools()
+
+from setuptools import setup, find_packages
+import sys
+import os
+import cStringIO
+
+
+### This is a lot of screwing around to populate the README for the package from
+# a template we have in the templ directory.
+sys.path.insert(0, "src/tome")
+import version
+
+lid = open("LICENSE.txt", "r")
+license = lid.read()
+lid.close()
+
+rid = open("README.txt", "r")
+readme = rid.read()
+rid.close()
+
+setup(
+    name='tome',
+    version=version.setuptools_string(),
+    author='Brian Mearns',
+    author_email='bmearns@ieee.org',
+    url='https://bitbucket.org/bmearns/tome/',
+    license=license,
+    description='Tome Markup Language for authors.',
+    long_description=readme,
+
+    install_requires=["templ>=1.0"],
+
+    package_dir={'': 'src'},
+    packages=find_packages('src'),  #Looks for __init__.py
+    include_package_data = True,    #Uses MANIFEST.in
+    data_files = [
+        ('misc', ['LICENSE.txt', 'README.txt', 'TODO.txt', 'BUGS.txt', 'CHANGES.txt']),
+    ],
+
+
+    entry_points = {
+        "console_scripts" : [
+            'tome = tome.main:main',
+            'tome-epub-template = tome.main:writeEpubTemplate',
+            'tome-latex-template = tome.main:writeLatexTemplate',
+            'tome-xml-schema = tome.main:writeXmlSchema',
+        ],
+    }
+)
+

src/tome/version.py

 You should have received a copy of the GNU Affero General Public License
 along with Tome.  If not, see <http://www.gnu.org/licenses/>.
 """
-
-MAJOR = 0
-MINOR = 1
-PATCH = 0
-SEMANTIC = 0
-
-COPYRIGHT = 2013
-YEAR = 2013
-MONTH = 1
-DAY = 21
-
-#Tag options are None, "dev", and "blood-"*
-# None means this is a released/tagged version.
-# "dev" means this is a development version from the trunk/mainline.
-# "blood" means it's on a branch. After the dash, fill in a short description
-# to identify the branch.
-#
-# Dev and blood versions are still numbered for the *previous* version,
-# because we may not know what the next version will be until we're finished.
-TAG = "dev"
-
-
-__months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-assert((MONTH > 0) and (MONTH <= len(__months)))
-
-def setuptools_string():
-    vstr = "%d.%d.%d.%d" % (MAJOR, MINOR, PATCH, SEMANTIC)
-    if TAG is not None:
-        vstr += "-p-%s" % TAG
-    return vstr
-
-def string():
-    vstr = "%d.%d.%d.%d" % (MAJOR, MINOR, PATCH, SEMANTIC)
-    if TAG is not None:
-        vstr += "-%s" % TAG
-    return vstr
-
-def datestr():
-    return "%d %s %02d" % (YEAR, __months[MONTH-1], DAY)
-
+
+MAJOR = 1
+MINOR = 0
+PATCH = 0
+SEMANTIC = 0
+
+YEAR = 2013
+MONTH = 1
+DAY = 24
+COPYRIGHT = YEAR
+
+#Tag options are None, "dev", and "blood-"*
+# None means this is a released/tagged version.
+# "dev" means this is a development version from the trunk/mainline.
+# "blood" means it's on a branch. After the dash, fill in a short description
+# to identify the branch.
+#
+# Dev and blood versions are still numbered for the *previous* version,
+# because we may not know what the next version will be until we're finished.
+TAG = None
+
+
+__months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+assert((MONTH > 0) and (MONTH <= len(__months)))
+
+def setuptools_string():
+    vstr = "%d.%d.%d.%d" % (MAJOR, MINOR, PATCH, SEMANTIC)
+    if TAG is not None:
+        vstr += "-p-%s" % TAG
+    return vstr
+
+def string():
+    vstr = "%d.%d.%d.%d" % (MAJOR, MINOR, PATCH, SEMANTIC)
+    if TAG is not None:
+        vstr += "-%s" % TAG
+    return vstr
+
+def datestr():
+    return "%d %s %02d" % (YEAR, __months[MONTH-1], DAY)
+