Skip to content

Commit

Permalink
ref: remove distutils dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Nov 22, 2024
1 parent ab72a90 commit c54952e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
2.19.1
- ref: remove distutils dependency
- docs: add developer's section
2.19.0
- feat: support accessing private S3 basins (#174)
Expand Down
10 changes: 3 additions & 7 deletions shapeout2/gui/update.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from distutils.version import LooseVersion, StrictVersion
import json
import os
import struct
import sys
import traceback
import urllib.request

from dclab.external.packaging import parse as parse_version
from PyQt6 import QtCore


Expand Down Expand Up @@ -58,12 +58,8 @@ def check_release(ghrepo="user/repo", version=None, timeout=20):
newversion = j["tag_name"]

if version is not None:
try:
new = StrictVersion(newversion)
old = StrictVersion(version)
except ValueError:
new = LooseVersion(newversion)
old = LooseVersion(version)
new = parse_version(newversion)
old = parse_version(version)
if new > old:
update = True
new_version = newversion
Expand Down
6 changes: 0 additions & 6 deletions tests/test_gui_update.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import encodings.idna # noqa: F401
import os
import socket

import pytest
Expand All @@ -15,10 +13,6 @@
NET_AVAILABLE = False


@pytest.mark.xfail(os.getenv("APPVEYOR") in ["true", "True"],
reason="does not always run on Appveyor")
@pytest.mark.xfail(os.getenv("CI") == "true",
reason="does not always run on travisCI")
@pytest.mark.skipif(not NET_AVAILABLE, reason="No network connection!")
def test_update_basic():
mdict = update.check_release(ghrepo="ZELLMECHANIK-DRESDEN/ShapeOut2",
Expand Down

0 comments on commit c54952e

Please sign in to comment.