move to git. fix py3.2. added py3.4 to travis.

schettino72 · schettino72 · commit 54ddfdc6ebea · 2014-08-30T10:29:21.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 *.pyc
-tests/data/*
+tests/data/*
+.doit.db
+doit.egg-info
+MANIFEST
+revision.txt
diff --git a/.hgignore b/.hgignore
diff --git a/.hgtags b/.hgtags
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
     - "2.7"
     - "3.2"
     - "3.3"
+    - "3.4"
 #    - 'pypy'  # dbm test fails, remove for now...
 
 before_install:
diff --git a/CHANGES b/CHANGES
@@ -3,9 +3,10 @@
 Changes
 =======
 
-0.26.dev
-=============
+0.26.0 (*2014-08-30*)
+======================
 
+ - moved development to git/github
  - `uptodate` callable "magic" arguments `task` and `values` are now optional
  - added command `info` to display task metadata
  - command `clean` smarter execution order
diff --git a/README.rst b/README.rst
@@ -4,8 +4,9 @@ README
 
 .. display some badges
 
-.. image:: https://pypip.in/v/doit/badge.png
-        :target: https://pypi.python.org/pypi/doit
+.. disable as this is showing the wrong version number
+   .. image:: https://pypip.in/v/doit/badge.png
+           :target: https://pypi.python.org/pypi/doit
 
 .. image:: https://pypip.in/d/doit/badge.png
         :target: https://pypi.python.org/pypi/doit
@@ -27,10 +28,9 @@ execute any kind of task
 Project Details
 ===============
 
- - Source code & Project management on bitbucket - https://bitbucket.org/schettino72/doit
+ - Project management on github - https://github.com/pydoit/doit
  - Website & docs - http://pydoit.org
  - Discussion group - https://groups.google.com/forum/#!forum/python-doit
- - Official github mirror at - https://github.com/pydoit/doit
 
 license
 =======
@@ -66,7 +66,7 @@ dependencies
 
 Tools required for development:
 
-- mercurial * VCS
+- git * VCS
 - py.test * unit-tests
 - mock * unit-tests
 - coverage * code coverage
@@ -131,31 +131,6 @@ The website will also includes epydoc generated API documentation.
 contributing
 ==============
 
-On bitbucket create pull requests on ``default`` branch.
-
 On github create pull requests using a named feature branch.
 
 
-github mirror setup
-=====================
-
-This is only needed if you will manage both upstream in github and bitbucket.
-For using github only just use `git` normally and ignore it is a mirror.
-
-* install hg-git (http://hg-git.github.io/) ``sudo pip install hg-git``.
-
-* enable the extension. on ``~/.hgrc``::
-
-    [extensions]
-    hggit =
-
-* add a named path ``github`` on ``doit/.hg/hgrc``::
-
-    [paths]
-    default = https://bitbucket.org/schettino72/doit
-    github = git+ssh://git@github.com/pydoit/doit.git
-
-* make sure you have a ssh key registered on github ::
-
-   $ hg push github
-
diff --git a/TODO.txt b/TODO.txt
@@ -1,7 +1,7 @@
 
 see
 
-https://bitbucket.org/schettino72/doit/issues?status=new&status=open
+https://github.com/pydoit/doit/issues
 
 0.X
 ----------
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -55,8 +55,8 @@
   <li><a href="{{ pathto('index') }}">Home</a>&nbsp;|&nbsp;</li>
   <li><a href="{{ pathto('contents') }}">Documentation</a>&nbsp;|&nbsp;</li>
   <!-- TODO news -->
-  <li><a class="external-link" href="https://bitbucket.org/schettino72/doit/src">Code</a>&nbsp;|&nbsp;</li>
-  <li><a class="external-link" href="https://bitbucket.org/schettino72/doit/issues?status=new&status=open">Issues</a>&nbsp;|&nbsp;</li>
+  <li><a class="external-link" href="https://github.com/pydoit/doit">Code</a>&nbsp;|&nbsp;</li>
+  <li><a class="external-link" href="https://github.com/pydoit/doit/issues">Issues</a>&nbsp;|&nbsp;</li>
   <li><a class="external-link" href="http://pypi.python.org/pypi/doit">Download</a>&nbsp;|&nbsp;</li>
   <li><a class="external-link" href="http://groups.google.co.in/group/python-doit">Forum</a></li>
 {% endblock %}
diff --git a/doc/cmd_run.rst b/doc/cmd_run.rst
@@ -95,7 +95,9 @@ it will have the same effect as executing
 
    $ doit --continue --reporter json my_task_1 my_task_2
 
-You need to check `doit_cmd.py <https://bitbucket.org/schettino72/doit/src/tip/doit/doit_cmd.py>`_ to find out how parameter maps to config names.
+You need to check `doit_cmd.py
+<https://github.com/pydoit/doit/blob/master/doit/doit_cmd.py>`_ to find out how
+parameter maps to config names.
 
 .. note::
 
@@ -204,7 +206,11 @@ Apart from the default it also includes:
 custom reporter
 -----------------
 
-It is possible to define your own custom reporter. Check the code on `doit/reporter.py <https://bitbucket.org/schettino72/doit/src/tip/doit/reporter.py>`_ ... It is easy to get started by sub-classing the default reporter as shown below. The custom reporter must be configured using DOIT_CONFIG dict.
+It is possible to define your own custom reporter. Check the code on
+`doit/reporter.py
+<https://github.com/pydoit/doit/blob/master/doit/reporter.py>`_ ... It is easy
+to get started by sub-classing the default reporter as shown below. The custom
+reporter must be configured using DOIT_CONFIG dict.
 
 .. literalinclude:: tutorial/custom_reporter.py
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.25'
+version = '0.26'
 # The full version, including alpha/beta/rc tags.
-release = '0.25'
+release = '0.26'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/index.rst b/doc/index.rst
@@ -133,7 +133,7 @@ Project Details
 
 * Download from `PyPi <http://pypi.python.org/pypi/doit>`_
 
-* Project management (bug tracker, feature requests and source code ) on `bitbucket <https://bitbucket.org/schettino72/doit>`_.
+* Project management (bug tracker, feature requests and source code ) on `bitbucket <https://github.com/pydoit/doit>`_.
 
 * Questions and feedback on `google group <http://groups.google.co.in/group/python-doit>`_.
 
diff --git a/dodo.py b/dodo.py
@@ -12,7 +12,7 @@
 from doit.tools import create_folder
 
 DOIT_CONFIG = {
-    'minversion': '0.24.dev0',
+    'minversion': '0.24.0',
     'default_tasks': ['pyflakes', 'ut'],
 #    'backend': 'sqlite3',
     }
@@ -134,7 +134,7 @@ def task_website_update():
 
 def task_revision():
     """create file with repo rev number"""
-    return {'actions': ["hg tip --template '{rev}:{node}' > revision.txt"]}
+    return {'actions': ["git rev-list --branches=master --max-count=1 HEAD > revision.txt"]}
 
 def task_manifest():
     """create manifest file for distutils """
@@ -146,7 +146,7 @@ def check_version():
         assert sys.version_info < (2,7) or sys.version_info > (2,7,2)
 
     # create manifest will all files under version control without .hg* files
-    cmd = """hg manifest | grep -vE ".*\.hg.*" > MANIFEST """
+    cmd = """git ls-tree --name-only -r HEAD > MANIFEST"""
     cmd2 = "echo 'revision.txt' >> MANIFEST"
     return {'actions': [check_version, cmd, cmd2]}
 
diff --git a/doit/version.py b/doit/version.py
@@ -1,2 +1,2 @@
 """doit version, defined out of __init__.py to avoid circular reference"""
-VERSION = (0, 26, 'dev0')
+VERSION = (0, 26, 0)
diff --git a/setup.py b/setup.py
@@ -48,7 +48,7 @@ def run(self):
 
 setup(name = 'doit',
       description = 'doit - Automation Tool',
-      version = '0.26.dev0',
+      version = '0.26.0',
       license = 'MIT',
       author = 'Eduardo Naufel Schettino',
       author_email = 'schettino72@gmail.com',
diff --git a/tests/test_cmd_info.py b/tests/test_cmd_info.py
@@ -1,3 +1,4 @@
+import six
 from six import StringIO
 
 import pytest
@@ -19,7 +20,7 @@ def test_info(self, depfile):
 
     def test_info_unicode(self, depfile):
         output = StringIO()
-        task = Task("t1", [], file_dep=[u'tests/data/dependency1'])
+        task = Task("t1", [], file_dep=[six.u('tests/data/dependency1')])
         cmd = Info(outstream=output, dep_file=depfile.name, task_list=[task])
         cmd._execute(['t1'])
         assert """name:'t1'""" in output.getvalue()

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
 see
 -https://bitbucket.org/schettino72/doit/issues?status=new&status=open
 +https://github.com/pydoit/doit/issues
 .X
 ----------