Merge pull request #17 from Binaergewitter/update

Update
Binaergewitter · Oct 11, 2023 · 11a47f8 · 11a47f8
2 parents 96d8356 + ecea7f0
commit 11a47f8
Show file tree

Hide file tree

Showing 6 changed files with 366 additions and 500 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,24 +7,24 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.8, 3.12]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install poetry==1.2.1
+          python -m pip install poetry==1.6.1
           python -m poetry install
 
       - name: run backend linter
         run: |
-          python -m poetry run pflake8 chapter_marker
+          python -m poetry run ruff check chapter_marker
 
       - name: build and install
         run: |

diff --git a/chapter_marker/bgt_get_titles.py b/chapter_marker/bgt_get_titles.py
@@ -11,6 +11,7 @@
 """
 
 import os
+import sys
 import urllib.request
 
 import requests
@@ -26,15 +27,14 @@ def current_show():
 
 
 def main():
-
     args = docopt(__doc__)
     apikey = os.environ.get("PAD_APIKEY", args["--apikey"])
     show = args["SHOW"]
     out = args["--out"]
 
     if not apikey:
         print(__doc__)
-        exit(1)
+        sys.exit(1)
     if not show:
         show = current_show()
     try:

diff --git a/chapter_marker/bgt_replace_text.py b/chapter_marker/bgt_replace_text.py
@@ -10,6 +10,7 @@
 """
 
 import os
+import sys
 import urllib.request
 
 import requests
@@ -25,7 +26,6 @@ def current_show():
 
 
 def main():
-
     args = docopt(__doc__)
     apikey = os.environ.get("PAD_APIKEY", None)
     if not apikey:
@@ -36,7 +36,7 @@ def main():
 
     if not apikey:
         print(__doc__)
-        exit(1)
+        sys.exit(1)
     if not show:
         show = current_show()
     try:

diff --git a/chapter_marker/tray.py b/chapter_marker/tray.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -p python3Packages.docopt python3Packages.pyqt5 python3Packages.notify2 python3Packages.requests qt5.qtbase -i python3 # noqa
+#!nix-shell -p python3Packages.docopt python3Packages.pyqt5 python3Packages.notify2 python3Packages.requests qt5.qtbase -i python3
 """ usage: chapter-marker [options] TITLEFILE [SHOW]
 
 options:
@@ -72,7 +72,6 @@ def __init__(self, title, is_comment=False, delta=None):
         self.delta = delta  # timedelta
 
     def __str__(self):
-
         if self.is_comment:
             return "# " + self.title
         elif self.delta is None: