Update linting for utils
This commit is contained in:
+3
-12
@@ -17,7 +17,7 @@ General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
"""
|
||||
""" # noqa
|
||||
from __future__ import annotations
|
||||
|
||||
import shutil
|
||||
@@ -88,7 +88,6 @@ def copySourceCode(dst: Path) -> None:
|
||||
if item.is_file():
|
||||
shutil.copyfile(item, dst / relSrc)
|
||||
print("Copied:", relSrc, flush=True)
|
||||
return
|
||||
|
||||
|
||||
def copyPackageFiles(dst: Path, setupPy: bool = False) -> None:
|
||||
@@ -114,8 +113,6 @@ def copyPackageFiles(dst: Path, setupPy: bool = False) -> None:
|
||||
text = text.replace("setup/description_pypi.md", "data/description_short.txt")
|
||||
writeFile(dst / "pyproject.toml", text)
|
||||
|
||||
return
|
||||
|
||||
|
||||
def toUpload(srcPath: str | Path, dstName: str | None = None) -> None:
|
||||
"""Copy a file produced by one of the build functions to the upload
|
||||
@@ -125,7 +122,6 @@ def toUpload(srcPath: str | Path, dstName: str | None = None) -> None:
|
||||
uplDir.mkdir(exist_ok=True)
|
||||
srcPath = Path(srcPath)
|
||||
shutil.copyfile(srcPath, uplDir / (dstName or srcPath.name))
|
||||
return
|
||||
|
||||
|
||||
def makeCheckSum(sumFile: str, cwd: Path | None = None) -> str:
|
||||
@@ -174,9 +170,7 @@ def appdataXml() -> str:
|
||||
"""Generate the appdata XML content."""
|
||||
raw = readFile(SETUP_DIR / "description_short.txt")
|
||||
desc = " ".join(raw.strip().splitlines()).strip()
|
||||
xml = readFile(SETUP_DIR / "novelwriter.appdata.xml")
|
||||
xml = xml.format(description=desc)
|
||||
return xml
|
||||
return readFile(SETUP_DIR / "novelwriter.appdata.xml").format(description=desc)
|
||||
|
||||
|
||||
def readFile(file: Path) -> str:
|
||||
@@ -197,7 +191,6 @@ def freshFolder(path: Path) -> None:
|
||||
print("Removing:", str(path), flush=True)
|
||||
shutil.rmtree(path)
|
||||
path.mkdir()
|
||||
return
|
||||
|
||||
|
||||
def systemCall(cmd: list, cwd: Path | str | None = None, env: dict | None = None) -> int:
|
||||
@@ -213,7 +206,7 @@ def systemCall(cmd: list, cwd: Path | str | None = None, env: dict | None = None
|
||||
|
||||
|
||||
def removeRedundantQt(qtBase: Path) -> None:
|
||||
"""Delete Qt files that are not needed"""
|
||||
"""Delete Qt files that are not needed."""
|
||||
|
||||
def unlinkIfFound(file: Path) -> None:
|
||||
if file.is_file():
|
||||
@@ -274,5 +267,3 @@ def removeRedundantQt(qtBase: Path) -> None:
|
||||
deleteFolder(qt6Dir / "qml")
|
||||
deleteFolder(plugDir / "qmlls")
|
||||
deleteFolder(plugDir / "qmllint")
|
||||
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user