Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Kummer committed Dec 19, 2023
1 parent e6f03bf commit b849ba5
Show file tree
Hide file tree
Showing 5 changed files with 311 additions and 272 deletions.
10 changes: 5 additions & 5 deletions BlenderUpdater.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
import urllib.request
import webbrowser
from datetime import datetime
from distutils.dir_util import copy_tree
from distutils.version import StrictVersion
from shutil import copytree
from packaging.utils import Version

import requests
import re

import mainwindow
import qdarkstyle

from PySide2 import QtWidgets, QtCore, QtGui
from PySide6 import QtWidgets, QtCore, QtGui

os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "1"

Expand Down Expand Up @@ -124,7 +124,7 @@ def run(self):
shutil.unpack_archive(self.filename, "./blendertemp/")
self.finishedEX.emit()
source = next(os.walk("./blendertemp/"))[1]
copy_tree(os.path.join("./blendertemp/", source[0]), dir_)
copytree(os.path.join("./blendertemp/", source[0]), dir_)
self.finishedCP.emit()
shutil.rmtree("./blendertemp")
self.finishedCL.emit()
Expand Down Expand Up @@ -215,7 +215,7 @@ def __init__(self, parent=None):
UpdateData = json.loads(Appupdate)
applatestversion = UpdateData["tag_name"]
logger.info(f"Version found online: {applatestversion}")
if StrictVersion(applatestversion) > StrictVersion(appversion):
if Version(applatestversion) > Version(appversion):
logger.info("Newer version found on Github")
self.btn_newVersion.clicked.connect(self.getAppUpdate)
self.btn_newVersion.setStyleSheet("background: rgb(73, 50, 20)")
Expand Down
6 changes: 4 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@ name = "pypi"

[packages]
requests = "*"
"pyside2" = "*"
"pyside6" = "*"
"bs4" = "*"
"urllib3" = "*"
qt-py = "*"
qdarkstyle = "*"
setuptools = "*"

[dev-packages]
pyinstaller = ">=6.3"
flake8 = "*"
black = "*"
packaging = "*"

[requires]
python_version = "3.8"
python_version = "3.12"

[pipenv]
allow_prereleases = true
Loading

0 comments on commit b849ba5

Please sign in to comment.