minor bug fixes for win 11 and pypi (#94)

* minor bug fixes for win 11 and pypi * fixing github actions workflow and updating * updates to ci/cd workflow
alexpdev · Jan 19, 2023 · 500cb8b · 500cb8b
1 parent c89630b
commit 500cb8b
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 33 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v4.1.0
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version  }}
       - name: Display Python Version

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # TorrentFileQt
 
+## Version 0.3.8
+
+-   Minor bug fixes for windows 11
+-   Updated CI/CD workflow and tools
+-   re-wrote tox workflow
+
+* * *
+
 ## Version 0.3.7
 
 -   Added bencode editor tab

diff --git a/Makefile b/Makefile
@@ -58,8 +58,6 @@ clean-build: ## remove build artifacts
 
 test: install clean ## run tests quickly with the default Python
 	tox
-	coverage report
-	coverage xml -o coverage.xml
 
 push: test ## push changes to remote
 	git add .

diff --git a/coverage.xml b/coverage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<coverage version="6.4.4" timestamp="1671431690966" lines-valid="2695" lines-covered="2695" line-rate="1" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.0.5" timestamp="1674102469930" lines-valid="2695" lines-covered="2695" line-rate="1" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>

diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ requires-python = ">=3.6"
 keywords = ["GUI", "Bittorrent", "metafile", "torrentfile"]
 authors = [{name = "alexpdev", email = "alexpdev@pm.me"}]
 license = {file = "LICENSE"}
-version = "0.3.7"
+version = "0.3.8"
 classifiers=[
     "Development Status :: 4 - Beta",
     "Operating System :: OS Independent",
@@ -23,6 +23,11 @@ classifiers=[
 dependencies = ["torrentfile", "PySide6"]
 dynamic = ["readme"]
 
+[project.urls]
+homepage = "https://github.com/alexpdev/torrentfileQt"
+repository = "https://github.com"
+issues = "https://github.com/alexpdev/torrentfileQt/issues"
+
 [project.scripts]
 torrentfileqt = "torrentfileQt.__main__:main"
 

diff --git a/torrentfileQt/createTab.py b/torrentfileQt/createTab.py
@@ -100,7 +100,7 @@ def __init__(self, parent=None):
         self.spacer2 = QSpacerItem(70, 0)
 
         sizePolicy = self.path_input.sizePolicy()
-        sizePolicy.setHorizontalPolicy(QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalPolicy(QSizePolicy.Policy.MinimumExpanding)
 
         self.announce_label.setAlignment(Qt.AlignmentFlag.AlignRight)
         self.web_seed_label.setAlignment(Qt.AlignmentFlag.AlignRight)

diff --git a/torrentfileQt/version.py b/torrentfileQt/version.py
@@ -15,4 +15,4 @@
 ##############################################################################
 """Application version id tag."""
 
-__version__ = "0.3.7"
+__version__ = "0.3.8"
diff --git a/tox.ini b/tox.ini
@@ -1,45 +1,99 @@
 [tox]
-envlist = py3
+envlist =
+    py3
+    format
+    pylint
+    pyroma
+    flake8
+    pycodestyle
+    bandit
+    pydocstyle
+
 
 [testenv]
-setenv =
-    GITHUB_WORKFLOW = 1
+basepython = python3
 deps =
     pyben
-    pyflakes
-    pylint
-    pydocstyle
-    PySide6
-    pyroma
     pytest-clarity
     pytest-cov
-    bandit
-    pytest-pylint
     pytest
     pytest-icdiff
     pytest-instafail
     pytest-randomly
-    pycodestyle
-    flake8
-    mccabe
-    black
-    yapf
-    autopep8
-    isort
 commands =
     pytest --cov=torrentfileQt --cov=tests
     coverage xml
     coverage html
-    flake8 torrentfileQt tests
-    black torrentfileQt tests
+
+[testenv:pylint]
+basepython = python3
+deps =
+    pylint
+    pytest
+commands =
+    pylint torrentfileQt tests
+
+[testenv:pyroma]
+basepython = python3
+deps =
+    pyroma
+commands =
+    pyroma .
+
+[testenv:flake8]
+basepython = python3
+deps =
+    pyflakes
+    mccabe
+    flake8[mccabe]
+commands =
+    flake8 torrentfileQt
+    flake8 tests
+
+[testenv:format]
+basepython = python3
+deps =
+    toml
+    black
+    isort
+    yapf[toml]
+    autopep8
+commands =
+    black tests torrentfileQt
     yapf -r -i torrentfileQt tests
     autopep8 -r torrentfileQt tests
-    isort torrentfileQt tests
-    pydocstyle torrentfileQt tests
-    pycodestyle torrentfileQt tests
-    pylint torrentfileQt tests
+    isort tests torrentfileQt
+
+[testenv:twinecheck]
+basepython = python3
+deps =
+    twine
+    build
+commands =
+    python -m build --sdist
+    twine check dist/*
+
+[testenv:bandit]
+basepython = python3
+deps =
+    toml
+    bandit[toml]
+commands =
     bandit -r -c pyproject.toml torrentfileQt tests
-    pyroma .
+
+[testenv:pycodestyle]
+basepython = python3
+deps =
+    pycodestyle
+commands =
+    pycodestyle torrentfileQt tests
+
+[testenv:pydocstyle]
+basepython = python3
+deps =
+    pydocstyle
+commands =
+    pydocstyle torrentfileQt tests
 
 [pydocstyle]
 ignore = D200, D210, D212, D213, D413, D407, D406, D203