Skip to content

Commit

Permalink
Merge branch 'release/0.2.1'
Browse files Browse the repository at this point in the history
* release/0.2.1:
  RLS: HISTORY.rst, __init__.py, setup.py: version 0.2.1
  BUG: pyrpo.py: cat > %r << EOF
  BUG,CLN: pyrpo.py: logname='pyrpo'
  BLD: Makefile: pull, push, BROWSERCMD lookups
  BLD: Makefile: twine
  • Loading branch information
westurner committed May 25, 2015
2 parents 4849135 + caba53c commit 219b75c
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 7 deletions.
12 changes: 12 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
History
=========

::

git log --format='* %s [%h]' master..develop
# [ ... ]

0.2.1 (2015-05-24)
+++++++++++++++++++
* BUG: pyrpo.py: sh_full report: ``cat > %r << EOF`` [91d5fb7]
* BUG,CLN: pyrpo.py: logname='pyrpo' [e029abe]
* BLD: Makefile: pull, push, BROWSERCMD lookups [59cbc66]
* BLD: Makefile: twine [d636e15]

0.2.0 (2015-04-25)
+++++++++++++++++++
* Development: https://github.com/westurner/pyrpo/commits/develop
Expand Down
16 changes: 13 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ lint:

test:
python setup.py test
nosetests ./pyrpo/pyrpo.py

test-all:
tox
Expand Down Expand Up @@ -80,7 +81,7 @@ dist: clean
ls -l dist

twine:
twine -v upload ./dist/*
twine upload ./dist/*

docs_rsync_to_local:
rsync -avr ./docs/_build/html/ $(_DOCSHTML)/pyrpo
Expand All @@ -89,6 +90,15 @@ docs_rebuild:
$(MAKE) docs
$(MAKE) docs_rsync_to_local

BROWSERCMD?=$(shell which web)
BROWSERCMD?=$(shell which x-www-browser)
BROWSERCMD?=$(shell which open)
open:
x-www-browser docs/_build/html/index.html
#x-www-browser docs/_build/singlehtml/index.html
$(BROWSERCMD) docs/_build/html/index.html
#$(BROWSERCMD) docs/_build/singlehtml/index.html

pull:
git pull

push:
git push
2 changes: 1 addition & 1 deletion pyrpo/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

__version__ = '0.2.0'
__version__ = '0.2.1'
5 changes: 3 additions & 2 deletions pyrpo/pyrpo.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import re
import subprocess
import sys

from collections import deque, namedtuple
from distutils.util import convert_path
from itertools import chain, imap, izip_longest
Expand All @@ -29,7 +30,7 @@
# print(kwargs)

# logging.basicConfig()
log = logging.getLogger('repos')
log = logging.getLogger('pyrpo')


def dtformat(time):
Expand Down Expand Up @@ -420,7 +421,7 @@ def recreate_remotes_shellcmd(self):
"""
# self.overwrite_hg_paths(output)
if self.cfg_file:
yield "echo >> %s << _EOF_" % self.cfg_file
yield "cat > %r << _EOF_" % self.cfg_file
yield self.read_cfg_file()
yield "_EOF_"

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def build_long_description():

setup(
name='pyrpo',
version='0.2.0',
version='0.2.1',
description=(
'A shell command wrapper for hg, git, bzr, svn'),
long_description=build_long_description(),
Expand Down

0 comments on commit 219b75c

Please sign in to comment.