Skip to content

Commit 4d50ded

Browse files
committed
Version 1.1.2 prep and fixed Python package
1 parent c19eb6a commit 4d50ded

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Diff for: configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ AC_DEFUN([CONF_PARSE_WITH],
2828

2929
define([VERSION_MAJOR], [1])
3030
define([VERSION_MINOR], [1])
31-
define([VERSION_FIX], [1])
31+
define([VERSION_FIX], [2])
3232
define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
3333
define([VERSION_SUFFIX], [_master])
3434

Diff for: python-amcrest.spec.in

+4
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ make check-local
147147
%{_sysconfdir}/profile.d/amcrest-cli-autocomplete.sh
148148

149149
%changelog
150+
* Sat Jan 21 2017 Marcelo Moreira de Mello <[email protected]> 1.1-2
151+
* Fixed and reorganized tree
152+
* Rebase
153+
150154
* Sat Jan 21 2017 Marcelo Moreira de Mello <[email protected]> 1.1-1
151155
* Exposed method get_base_url()
152156

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from setuptools import setup, find_packages
33

44
setup(name='amcrest',
5-
version='1.1.1',
5+
version='1.1.2',
66
description='Python wrapper implementation for Amcrest cameras.',
77
author='Douglas Schilling Landgraf, Marcelo Moreira de Mello',
88

Diff for: src/amcrest/http.py

-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ def __base_url(self, param=""):
7070
return '%s://%s:%s/cgi-bin/%s' % (self._protocol, self._host,
7171
str(self._port), param)
7272

73-
def get_base_url(self):
74-
return self._base_url
75-
7673
def command(self, cmd, retries=None, timeout_cmd=None):
7774
"""
7875
Args:

Diff for: src/amcrest/utils.py

+3
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ def percent(self, part, whole):
4242
"""Convert data to percent"""
4343
result = 100 * float(part)/float(whole)
4444
return float('{:.{prec}f}'.format(result, prec=PRECISION))
45+
46+
def get_base_url(self):
47+
return self._base_url

0 commit comments

Comments
 (0)