Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: versionChecker and downloadloc #1633

Merged
merged 1 commit into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pyinstaller/release-linux
pyinstaller/release-win
pyinstaller/version.txt
pyinstaller/electron/version-data.json
pyinstaller/electron/downloadloc.js
pyinstaller/electron/node_modules
pyinstaller/electron/dist
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion pyinstaller/electron/downloadloc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

function getDownloadLocation(version, platformname) {
return `http://specterext.bitcoinops.de/user/k9ert/dice/releases/download/${version}/diced-${version}-${platformname}.zip`
return `https://github.com/cryptoadvance/specter-desktop/releases/download/${version}/specterd-${version}-${platformname}.zip`
}

function appName() {
Expand Down
12 changes: 6 additions & 6 deletions src/cryptoadvance/specter/util/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def _get_binary_version(self):
logger.warning(
"We're checking here for a different binary than specter-desktop. We're hopefully in a pytest"
)
latest = VersionChecker._get_latest_version_from_github(self.specter)
latest = VersionChecker._get_latest_version_from_github()
return current, latest

def _get_pip_version(self):
Expand Down Expand Up @@ -136,19 +136,19 @@ def get_version_info(self):
self.stop()
return current, latest, False

@classmethod
def _get_latest_version_from_github(cls, specter):
def _get_latest_version_from_github(self):
try:
if specter:
requests_session = specter.requests_session(force_tor=False)
if self.specter:
requests_session = self.specter.requests_session(force_tor=False)
else:
requests_session = requests.Session()

print(requests_session.get().json())
releases = (
requests_session.get(f"https://pypi.org/pypi/{self.name}/json")
.json()["releases"]
.keys()
)

latest = list(releases)[-1]
except Exception as e:
logger.exception(e)
Expand Down
23 changes: 23 additions & 0 deletions tests/test_util_version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from unittest.mock import MagicMock
import pytest
from cryptoadvance.specter.specter_error import SpecterError
from cryptoadvance.specter.util.version import _parse_version, compare
Expand All @@ -19,6 +20,7 @@ def test_VersionChecker(
imp_lib_mock,
mock_installation_type,
mock_latest,
caplog,
):
mock_latest.return_value = "v9.10.21"
imp_lib_mock.return_value = "1.2.3"
Expand Down Expand Up @@ -51,6 +53,27 @@ def test_VersionChecker(
)


@patch("cryptoadvance.specter.util.version.requests")
@patch(
"cryptoadvance.specter.util.version.VersionChecker.installation_type",
new_callable=PropertyMock,
)
@patch("cryptoadvance.specter.util.version.importlib_metadata.version")
@patch("cryptoadvance.specter.util.version.VersionChecker._version_txt_content")
def test_VersionChecker_get_binary_version(
VersionChecker_version_txt_content,
imp_lib_mock,
mock_installation_type,
mock_requests_session: MagicMock,
caplog,
):
mock_requests_session.Session().get().json.return_value = {
"releases": {"0.10.0": None, "1.9.0rc5": None}
}
vc = VersionChecker(name="joke")
assert vc._get_latest_version_from_github() == "1.9.0rc5"


def test_parse_version():
assert _parse_version("v1.5.9") == {
"major": 1,
Expand Down