Merge branch 'dev' into resize

agusmakmun · Feb 4, 2025 · c10ed54 · c10ed54
2 parents d166531 + b8c3746
commit c10ed54
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 86 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,39 +11,15 @@ on:
 # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os: [ macos-latest, ubuntu-latest ]
-        python-version: [ 3.9, "3.10" ]
-        django-version: [ 3.2, 4.0, 4.1, 4.2 ]
+        python-version: [ "3.10", "3.11", "3.12" , "3.13"]
+        django-version: [ "5.0", "5.1" ]
         include:
-          - os: macos-latest
-            python-version: "3.8"
-            django-version: "3.2"
-          - os: ubuntu-latest
-            python-version: "3.8"
-            django-version: "3.2"
-          - os: macos-latest
-            python-version: "3.8"
-            django-version: "4.0"
-          - os: ubuntu-latest
-            python-version: "3.8"
-            django-version: "4.0"
-          - os: macos-latest
-            python-version: "3.10"
-            django-version: "5.0"
-          - os: ubuntu-latest
-            python-version: "3.10"
-            django-version: "5.0"
-          - os: macos-latest
-            python-version: "3.10"
-            django-version: "5.0.3"
-          - os: ubuntu-latest
-            python-version: "3.10"
-            django-version: "5.0.3"
-
+          - python-version: "3.9"
+            django-version: "4.2"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -55,8 +31,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install -q Django==${{ matrix.django-version }}
-          python -m pip install --upgrade pip
+          pip install -U pip setuptools 
+          pip install -q django==${{ matrix.django-version }}
           python setup.py install
 
       - name: Test with pytest

diff --git a/martor/static/martor/css/martor-admin.css b/martor/static/martor/css/martor-admin.css
@@ -127,6 +127,11 @@ fieldset .form-row .main-martor {
   display: revert;
 }
 
+/* fix issue: #270 */
+table {
+  caption-side: top;
+}
+
 /* fix issue: #168 */
 @media (prefers-color-scheme: dark) {
   body {

diff --git a/martor/static/martor/css/martor-admin.min.css b/martor/static/martor/css/martor-admin.min.css
@@ -129,6 +129,10 @@ fieldset .form-row .main-martor {
     display: revert
 }
 
+table {
+    caption-side: top;
+}
+
 @media (prefers-color-scheme:dark) {
     body {
         color: #fff;

diff --git a/martor/static/plugins/css/ace.min.css b/martor/static/plugins/css/ace.min.css
diff --git a/martor/static/plugins/css/highlight.min.css b/martor/static/plugins/css/highlight.min.css
diff --git a/martor/static/plugins/js/ace.js b/martor/static/plugins/js/ace.js
diff --git a/martor/static/plugins/js/ext-language_tools.js b/martor/static/plugins/js/ext-language_tools.js
diff --git a/martor/static/plugins/js/mode-markdown.js b/martor/static/plugins/js/mode-markdown.js
diff --git a/martor/static/plugins/js/theme-github.js b/martor/static/plugins/js/theme-github.js
diff --git a/martor/widgets.py b/martor/widgets.py
@@ -88,6 +88,8 @@ class Media:
         css = {
             "all": (
                 "plugins/css/ace.min.css",
+                "plugins/css/highlight.min.css",
+                "plugins/css/resizable.min.css",
                 "martor/css/martor.%s.min.css" % selected_theme,
             )
         }

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-urllib3<2 ; python_version < '3.7' # urllib3 2.0 dropped support for Python 3.6
-zipp<3.7 ; python_version < '3.7' # zipp 3.7.0 dropped support for Python 3.6
-Django>=3.2
-Markdown<3.6
+urllib3
+zipp
+Django
+Markdown
 requests
 bleach
 tzdata
diff --git a/setup.cfg b/setup.cfg
@@ -10,7 +10,7 @@ max-line-length = 120
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
 
 [mypy]
-python_version = 3.7
+python_version = 3.9
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True

diff --git a/setup.py b/setup.py
@@ -27,17 +27,18 @@ def get_requirements():
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
-        "Framework :: Django :: 4.1",
         "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
+        "Framework :: Django :: 5.1",
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Programming Language :: JavaScript",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],