Merge pull request #425 from ThomasWaldmann/fixes

Fixes
This commit is contained in:
TW 2019-04-09 22:34:29 +02:00 committed by GitHub
commit 1ff09a2ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -10,7 +10,9 @@ with open('README.rst') as f:
setup( setup(
name='nsupdate', name='nsupdate',
use_scm_version=True, use_scm_version={
'write_to': 'src/nsupdate/_version.py',
},
url='http://github.com/nsupdate-info/nsupdate.info/', url='http://github.com/nsupdate-info/nsupdate.info/',
license='BSD', license='BSD',
author='The nsupdate.info Team (see AUTHORS)', author='The nsupdate.info Team (see AUTHORS)',

View File

@ -4,7 +4,7 @@ nsupdate - dynamic DNS service
import re import re
from setuptools_scm import get_version from ._version import version
class Version(tuple): # pragma: no cover class Version(tuple): # pragma: no cover
@ -62,6 +62,3 @@ class Version(tuple): # pragma: no cover
if self.additional != 'd0': if self.additional != 'd0':
version_str += self.additional version_str += self.additional
return version_str return version_str
version = get_version()

View File

@ -134,7 +134,8 @@ def basic_authenticate(auth):
return username, password return username, password
def check_api_auth(username, password): @log.logger(__name__)
def check_api_auth(username, password, logger=None):
""" """
Check username and password against our database. Check username and password against our database.