From 2e27de151ba06e86316ba605fcc4564127401b7a Mon Sep 17 00:00:00 2001 From: mtoshi Date: Sat, 18 Apr 2015 10:58:29 +0900 Subject: [PATCH 1/3] Change package structure. --- .travis.yml | 2 +- setup.cfg | 4 ---- setup.py | 4 ++-- tox.ini | 3 ++- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84e1853..fc0e0cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: - 3.3 - 3.4 install: -- pip install virtualenv tox docutils coveralls +- pip install virtualenv tox coveralls script: - python setup.py test - python setup.py check -r diff --git a/setup.cfg b/setup.cfg index d9c05c9..4e5be42 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,3 @@ build-base = _build [sdist] formats = gztar - -[check] -strict = 1 -restructuredtext = 1 diff --git a/setup.py b/setup.py index c88f3e7..a1990c5 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def run_tests(self): with open(os.path.join(here, 'README.rst')) as f: README = f.read() -requires = ['Sphinx'] +requires = [] with open('requirements.txt', 'w') as _file: _file.write('\n'.join(requires)) @@ -65,7 +65,7 @@ def run_tests(self): setup( name="rancidcmd", version="0.1.4", - description='Rancid Command Wrapper Tool', + description='Rancid Command Wrapper.', long_description=README, author='Toshikatsu Murakoshi', author_email='mtoshi.g@gmail.com', diff --git a/tox.ini b/tox.ini index 9a3a78f..1418705 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,6 @@ explain = true [testenv] deps= - -rrequirements.txt pytest pytest-cov pytest-flakes @@ -29,6 +28,8 @@ commands = pylint pytmpl --rcfile={toxinidir}/.pylintrc [testenv:docs] +deps= + Sphinx changedir = docs commands = sphinx-build -b html -c source source build/html From d1d14c3dcbb2af4d0bf38c68b4567cb3a64d4ba2 Mon Sep 17 00:00:00 2001 From: mtoshi Date: Sat, 18 Apr 2015 14:34:01 +0900 Subject: [PATCH 2/3] Change README --- README.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 2a791d1..1738c94 100644 --- a/README.rst +++ b/README.rst @@ -6,8 +6,8 @@ Rancidcmd is a utility tool for network operators. This module is wrapper of RANCID login commands.(like cloing, jlogin ...) So if you use this moudle, then you have to install RANCID in some way. Why did I make this module? As everybody knows RANCID is popular as auto login solutions. -Of course I want to use RANCID and I thought want to use without password of ".cloginrc". -Rancidcmd can use RANCID login command like a clogin with empty ".clgoinrc". +Of course I want to use RANCID. And I wanted to do using without password of ".cloginrc". +This Rancidcmd can use RANCID login command like a clogin with empty ".clgoinrc". .. image:: https://secure.travis-ci.org/mtoshi/rancidcmd.svg?branch=master :target: http://travis-ci.org/mtoshi/rancidcmd @@ -25,7 +25,7 @@ Requirements Installation ============= -#. Please install the Rancid in advance. +#. Please install the RANCID in advance. For CentOS :: @@ -39,7 +39,7 @@ Installation $ port install rancid -#. After Rancid, please install Rancidcmd :: +#. After RANCID, please install Rancidcmd :: $ pip install rancidcmd @@ -49,6 +49,8 @@ Installation $ cd rancidcmd $ sudo python setup.py install +* Care of "~/.cloginrc" existence is not necessary. + If executed user doesn't have "~/.cloginrc", then Rancidcmd makes empty "~/.cloginrc". Using example ============== From 327e06136ef1c07ae0e1047838b824fcfe663218 Mon Sep 17 00:00:00 2001 From: mtoshi Date: Sat, 18 Apr 2015 14:52:24 +0900 Subject: [PATCH 3/3] Ver 0.1.5 --- docs/source/conf.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index eb528b0..8507f44 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -65,9 +65,9 @@ # built documents. # # The short X.Y version. -version = '0.1.4' +version = '0.1.5' # The full version, including alpha/beta/rc tags. -release = '0.1.4' +release = '0.1.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index a1990c5..4144755 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ def run_tests(self): setup( name="rancidcmd", - version="0.1.4", + version="0.1.5", description='Rancid Command Wrapper.', long_description=README, author='Toshikatsu Murakoshi',