make -> fab

--HG--
branch : trunk

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 6622bd1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Jinja Makefile
-# ~~~~~~~~~~~~~~
-#
-# Shortcuts for various tasks.
-#
-# :copyright: 2007 by Armin Ronacher.
-# :license: BSD, see LICENSE for more details.
-#
-
-test:
-       @(cd tests; py.test $(TESTS))
-
-test-coverage:
-       @(cd tests; py.test -C $(TESTS))
-
-html-documentation:
-       @(cd docs; make html)
-
-pdf-documentation:
-       @(cd docs; make latex; cd _build/latex; make all-pdf)
-
-webpage:
-       @(cd ../www; ./generate.py)
-
-pylint:
-       @pylint --rcfile scripts/pylintrc jinja

diff --git a/setup.py b/setup.py
index 8ea41d853258a28ea7cbc881a8e1d3213bc107c7..e94b92f88cf2db23028cf8f2edc4a03dd7f04e03 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,11 @@ from distutils.command.build_ext import build_ext
 from distutils.errors import CCompilerError, DistutilsPlatformError
 
 
+#: don't change the variable and assignment.  the fabfile parses this
+#: file to get the version for deployment from it.
+VERSION = '2.0'
+
+
 data_files = []
 documentation_path = 'docs/_build/html'
 if os.path.exists(documentation_path):
@@ -96,7 +101,7 @@ available."""
 
 setup(
     name='Jinja2',
-    version='2.0rc1',
+    version=VERSION,
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',