Commits

Hong Minhee committed 5678ed1 Merge

Merged.

Comments (0)

Files changed (8)

-e3a01f07735c3dadcacd47dbb3eb685ff29cfd20 0.1
+f5dbbb529697ba5555bf0b61744d6be9ca343b2b 0.1
+recursive-include irclog/web/templates *
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
+from irclog.version import VERSION
 
 # -- General configuration -----------------------------------------------------
 
 
 # General information about the project.
 project = u'irclog'
-copyright = u'2010, Hong Minhee'
+copyright = u'2010--2011, Hong Minhee'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.2'
+version = VERSION
 # The full version, including alpha/beta/rc tags.
-release = '0.2'
+release = VERSION
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {"http://docs.python.org/": None,
-                       "http://jinja.pocoo.org/2/documentation/": None}
+                       "http://jinja.pocoo.org/docs/": None}
       irclog/web
       irclog/web/server
       irclog/tests
+      irclog/version
 

docs/irclog/version.rst

+
+.. automodule:: irclog.version
+   :members:
+

irclog/version.py

+""":mod:`irclog.version` --- Version info
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"""
+
+#: (:class:`tuple`) The version numbers in tuple e.g. ``(1, 2, 3)``.
+VERSION_INFO = (0, 2, 0)
+
+#: (:class:`basestring`) The version string e.g. ``'1.2.3'``.
+VERSION = '.'.join(str(v) for v in VERSION_INFO)
+

irclog/web/templates/basic/base.html

     <meta charset="utf-8">
     <title>{% block title -%} irclog {%- endblock %}</title>
     <!--[if lt IE 9]>
-      <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="{{ __environ__['wsgi.url_scheme'] -}}
+                   ://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <link rel="stylesheet" type="text/css" media="screen"
           href="{{ 'style.css'|url }}">
     <link rel="shortcut icon" href="{{ 'favicon.ico'|url }}" />
-    <script
-      src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
+    <script src="{{ __environ__['wsgi.url_scheme'] -}}
+                 ://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
     </script>
   </head>
   <body>
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
+from irclog.version import VERSION
 
 try:
     _f = open(os.path.join(os.path.dirname(__file__), "doc", "index.rst"))
 setup(name="irclog",
       description="The web IRC loger view.",
       long_description=long_description,
-      version="0.2",
-      url="http://packages.python.org/irclog/",
+      version=VERSION,
+      url='http://irclog.rtfd.org/',
       author="Hong MinHee",
       author_email="minhee" "@" "dahlia.kr",
       packages=["irclog", "irclog.web"],