diff --git a/fdroidserver/common.py b/fdroidserver/common.py index df8d686c..aacbb7bf 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1007,6 +1007,9 @@ class vcs: self.refreshed = False self.srclib = None + def _gettags(self): + raise NotImplementedError + def repotype(self): return None diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py index 0661bb3a..06509db3 100644 --- a/fdroidserver/deploy.py +++ b/fdroidserver/deploy.py @@ -33,7 +33,6 @@ import shutil from . import _ from . import common from . import index -from . import update from .exception import FDroidException config = None @@ -524,7 +523,7 @@ def upload_apk_to_android_observatory(path): apkfilename = os.path.basename(path) r = requests.post('https://androidobservatory.org/', - data={'q': update.sha256sum(path), 'searchby': 'hash'}, + data={'q': common.sha256sum(path), 'searchby': 'hash'}, headers=net.HEADERS, timeout=300) if r.status_code == 200: # from now on XPath will be used to retrieve the message in the HTML diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 4fba148c..6e5c445b 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -764,6 +764,8 @@ def parse_metadata(metadatapath): try: commit_id = common.get_head_commit_id(git.Repo(build_dir)) logging.debug(_('Including metadata from %s@%s') % (metadata_in_repo, commit_id)) + # See https://github.com/PyCQA/pylint/issues/2856 . + # pylint: disable-next=no-member except git.exc.InvalidGitRepositoryError: logging.debug(_('Including metadata from {path}').format(metadata_in_repo)) app_in_repo = parse_metadata(metadata_in_repo) diff --git a/fdroidserver/vmtools.py b/fdroidserver/vmtools.py index e489ce4b..f367a3a3 100644 --- a/fdroidserver/vmtools.py +++ b/fdroidserver/vmtools.py @@ -199,6 +199,7 @@ class FDroidBuildVm: def __init__(self, srvdir): """Create new server class.""" + self.provider = None self.srvdir = srvdir self.srvname = basename(srvdir) + '_default' self.vgrntfile = os.path.join(srvdir, 'Vagrantfile') diff --git a/pyproject.toml b/pyproject.toml index d2cb8c55..a3a1dda2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,6 @@ disable = [ "no-else-continue", "no-else-raise", "no-else-return", - "no-member", "subprocess-run-check", "use-dict-literal", ] diff --git a/tests/gradle-release-checksums.py b/tests/gradle-release-checksums.py index 38784052..f020c0bd 100755 --- a/tests/gradle-release-checksums.py +++ b/tests/gradle-release-checksums.py @@ -116,6 +116,8 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in remote_name = 'fdroid-bot' try: remote = git_repo.create_remote(remote_name, url) + # See https://github.com/PyCQA/pylint/issues/2856 . + # pylint: disable-next=no-member except git.exc.GitCommandError: remote = git.remote.Remote(git_repo, remote_name) remote.set_url(url) diff --git a/tests/ndk-release-checksums.py b/tests/ndk-release-checksums.py index 2f39bc68..b53d2387 100755 --- a/tests/ndk-release-checksums.py +++ b/tests/ndk-release-checksums.py @@ -99,6 +99,8 @@ if git_repo.is_dirty() and 'fdroidserver/common.py' in modified: remote_name = 'fdroid-bot' try: remote = git_repo.create_remote(remote_name, url) + # See https://github.com/PyCQA/pylint/issues/2856 . + # pylint: disable-next=no-member except git.exc.GitCommandError: remote = git.remote.Remote(git_repo, remote_name) remote.set_url(url)