Merge pull request #188 from camelot-dev/vinayak/2024-12-25-update-de…

…p-versions Fix library usage and update versions
camelot-dev · Dec 25, 2024 · ed9dcc0 · ed9dcc0
2 parents 2a8e6ca + 12a31da
commit ed9dcc0
Show file tree

Hide file tree

Showing 15 changed files with 203 additions and 240 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -17,16 +17,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: Set up Python 3.8
+      - name: Set up Python 3.13
         uses: actions/setup-python@v1
         with:
-          python-version: '3.8'
+          python-version: '3.13'
           architecture: ${{ matrix.config.python-arch }}
       - name: Install Excalibur
         run: |
           python -m pip install --upgrade pip
           python -m pip install pyinstaller
-          python -m pip install .
+          python -m pip install ".[all]"
       - name: Build with PyInstaller on Ubuntu and MacOS
         if: runner.os == 'Linux' || runner.os == 'macOS'
         run: |

diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.11, 3.12, 3.13]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,8 +26,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
-        pip install .
+        python -m pip install ".[all]"
     - name: Test with pytest
       run: |
-        pytest
+        python -m pytest
diff --git a/docs/_themes/flask_theme_support.py b/docs/_themes/flask_theme_support.py
@@ -23,76 +23,67 @@ class FlaskyStyle(Style):
     styles = {
         # No corresponding class for the following:
         # Text:                    "", # class:  ''
-        Whitespace:                "underline #f8f8f8",       # class: 'w'
-        Error:                     "#a40000 border:#ef2929",  # class: 'err'
-        Other:                     "#000000",                 # class 'x'
-
-        Comment:                   "italic #8f5902",  # class: 'c'
-        Comment.Preproc:           "noitalic",        # class: 'cp'
-
-        Keyword:                   "bold #004461",    # class: 'k'
-        Keyword.Constant:          "bold #004461",    # class: 'kc'
-        Keyword.Declaration:       "bold #004461",    # class: 'kd'
-        Keyword.Namespace:         "bold #004461",    # class: 'kn'
-        Keyword.Pseudo:            "bold #004461",    # class: 'kp'
-        Keyword.Reserved:          "bold #004461",    # class: 'kr'
-        Keyword.Type:              "bold #004461",    # class: 'kt'
-
-        Operator:                  "#582800",   # class: 'o'
-        Operator.Word:             "bold #004461",   # class: 'ow' - like keywords
-
-        Punctuation:               "bold #000000",   # class: 'p'
-
+        Whitespace: "underline #f8f8f8",  # class: 'w'
+        Error: "#a40000 border:#ef2929",  # class: 'err'
+        Other: "#000000",  # class 'x'
+        Comment: "italic #8f5902",  # class: 'c'
+        Comment.Preproc: "noitalic",  # class: 'cp'
+        Keyword: "bold #004461",  # class: 'k'
+        Keyword.Constant: "bold #004461",  # class: 'kc'
+        Keyword.Declaration: "bold #004461",  # class: 'kd'
+        Keyword.Namespace: "bold #004461",  # class: 'kn'
+        Keyword.Pseudo: "bold #004461",  # class: 'kp'
+        Keyword.Reserved: "bold #004461",  # class: 'kr'
+        Keyword.Type: "bold #004461",  # class: 'kt'
+        Operator: "#582800",  # class: 'o'
+        Operator.Word: "bold #004461",  # class: 'ow' - like keywords
+        Punctuation: "bold #000000",  # class: 'p'
         # because special names such as Name.Class, Name.Function, etc.
         # are not recognized as such later in the parsing, we choose them
         # to look the same as ordinary variables.
-        Name:                      "#000000",         # class: 'n'
-        Name.Attribute:            "#c4a000",         # class: 'na' - to be revised
-        Name.Builtin:              "#004461",         # class: 'nb'
-        Name.Builtin.Pseudo:       "#3465a4",         # class: 'bp'
-        Name.Class:                "#000000",         # class: 'nc' - to be revised
-        Name.Constant:             "#000000",         # class: 'no' - to be revised
-        Name.Decorator:            "#888",            # class: 'nd' - to be revised
-        Name.Entity:               "#ce5c00",         # class: 'ni'
-        Name.Exception:            "bold #cc0000",    # class: 'ne'
-        Name.Function:             "#000000",         # class: 'nf'
-        Name.Property:             "#000000",         # class: 'py'
-        Name.Label:                "#f57900",         # class: 'nl'
-        Name.Namespace:            "#000000",         # class: 'nn' - to be revised
-        Name.Other:                "#000000",         # class: 'nx'
-        Name.Tag:                  "bold #004461",    # class: 'nt' - like a keyword
-        Name.Variable:             "#000000",         # class: 'nv' - to be revised
-        Name.Variable.Class:       "#000000",         # class: 'vc' - to be revised
-        Name.Variable.Global:      "#000000",         # class: 'vg' - to be revised
-        Name.Variable.Instance:    "#000000",         # class: 'vi' - to be revised
-
-        Number:                    "#990000",         # class: 'm'
-
-        Literal:                   "#000000",         # class: 'l'
-        Literal.Date:              "#000000",         # class: 'ld'
-
-        String:                    "#4e9a06",         # class: 's'
-        String.Backtick:           "#4e9a06",         # class: 'sb'
-        String.Char:               "#4e9a06",         # class: 'sc'
-        String.Doc:                "italic #8f5902",  # class: 'sd' - like a comment
-        String.Double:             "#4e9a06",         # class: 's2'
-        String.Escape:             "#4e9a06",         # class: 'se'
-        String.Heredoc:            "#4e9a06",         # class: 'sh'
-        String.Interpol:           "#4e9a06",         # class: 'si'
-        String.Other:              "#4e9a06",         # class: 'sx'
-        String.Regex:              "#4e9a06",         # class: 'sr'
-        String.Single:             "#4e9a06",         # class: 's1'
-        String.Symbol:             "#4e9a06",         # class: 'ss'
-
-        Generic:                   "#000000",         # class: 'g'
-        Generic.Deleted:           "#a40000",         # class: 'gd'
-        Generic.Emph:              "italic #000000",  # class: 'ge'
-        Generic.Error:             "#ef2929",         # class: 'gr'
-        Generic.Heading:           "bold #000080",    # class: 'gh'
-        Generic.Inserted:          "#00A000",         # class: 'gi'
-        Generic.Output:            "#888",            # class: 'go'
-        Generic.Prompt:            "#745334",         # class: 'gp'
-        Generic.Strong:            "bold #000000",    # class: 'gs'
-        Generic.Subheading:        "bold #800080",    # class: 'gu'
-        Generic.Traceback:         "bold #a40000",    # class: 'gt'
+        Name: "#000000",  # class: 'n'
+        Name.Attribute: "#c4a000",  # class: 'na' - to be revised
+        Name.Builtin: "#004461",  # class: 'nb'
+        Name.Builtin.Pseudo: "#3465a4",  # class: 'bp'
+        Name.Class: "#000000",  # class: 'nc' - to be revised
+        Name.Constant: "#000000",  # class: 'no' - to be revised
+        Name.Decorator: "#888",  # class: 'nd' - to be revised
+        Name.Entity: "#ce5c00",  # class: 'ni'
+        Name.Exception: "bold #cc0000",  # class: 'ne'
+        Name.Function: "#000000",  # class: 'nf'
+        Name.Property: "#000000",  # class: 'py'
+        Name.Label: "#f57900",  # class: 'nl'
+        Name.Namespace: "#000000",  # class: 'nn' - to be revised
+        Name.Other: "#000000",  # class: 'nx'
+        Name.Tag: "bold #004461",  # class: 'nt' - like a keyword
+        Name.Variable: "#000000",  # class: 'nv' - to be revised
+        Name.Variable.Class: "#000000",  # class: 'vc' - to be revised
+        Name.Variable.Global: "#000000",  # class: 'vg' - to be revised
+        Name.Variable.Instance: "#000000",  # class: 'vi' - to be revised
+        Number: "#990000",  # class: 'm'
+        Literal: "#000000",  # class: 'l'
+        Literal.Date: "#000000",  # class: 'ld'
+        String: "#4e9a06",  # class: 's'
+        String.Backtick: "#4e9a06",  # class: 'sb'
+        String.Char: "#4e9a06",  # class: 'sc'
+        String.Doc: "italic #8f5902",  # class: 'sd' - like a comment
+        String.Double: "#4e9a06",  # class: 's2'
+        String.Escape: "#4e9a06",  # class: 'se'
+        String.Heredoc: "#4e9a06",  # class: 'sh'
+        String.Interpol: "#4e9a06",  # class: 'si'
+        String.Other: "#4e9a06",  # class: 'sx'
+        String.Regex: "#4e9a06",  # class: 'sr'
+        String.Single: "#4e9a06",  # class: 's1'
+        String.Symbol: "#4e9a06",  # class: 'ss'
+        Generic: "#000000",  # class: 'g'
+        Generic.Deleted: "#a40000",  # class: 'gd'
+        Generic.Emph: "italic #000000",  # class: 'ge'
+        Generic.Error: "#ef2929",  # class: 'gr'
+        Generic.Heading: "bold #000080",  # class: 'gh'
+        Generic.Inserted: "#00A000",  # class: 'gi'
+        Generic.Output: "#888",  # class: 'go'
+        Generic.Prompt: "#745334",  # class: 'gp'
+        Generic.Strong: "bold #000000",  # class: 'gs'
+        Generic.Subheading: "bold #800080",  # class: 'gu'
+        Generic.Traceback: "bold #a40000",  # class: 'gt'
     }