Merge pull request #175 from caktus/sc-16010-python-3-10-compatible-scribbler-release

Update Iterable import and python version to 3.10

Author: LorienOlive

.github/workflows/test.yml

@@ -19,7 +19,8 @@ jobs:
       matrix:
         # tox-gh-actions will only run the tox environments which match the currently
         # running python-version. See [gh-actions] in tox.ini for the mapping
-        python-version: [3.7, 3.8, 3.9]
+        # version 3.10 is explicitly a string because otherwise github actions truncates the zero
+        python-version: [3.7, 3.8, 3.9, '3.10']
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -41,21 +42,21 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox tox-gh-actions
       - name: Test with tox
-        run: tox -e py39-coverage
+        run: tox -e py310-coverage
 
   build-docs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.travis.yml

@@ -7,6 +7,9 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
+  - "3.9"
+  - "3.10"
 
 services:
   - xvfb

scribbler/__init__.py

@@ -1,7 +1,7 @@
 "django-scribbler is an application for managing snippets of text for a Django website."
 
 
-__version__ = '1.1.0'
+__version__ = '1.2.0'
 
 
 default_app_config = 'scribbler.apps.ScribblerAppConfig'

scribbler/utils.py

@@ -1,5 +1,4 @@
-from collections import Iterable
-
+from collections.abc import Iterable
 
 def _flatten(iterable):
     """

tox.ini

@@ -1,15 +1,16 @@
 # Django version: Supported python versions
 #
-# 2.2: 3.7, 3.8, 3.9
-# 3.2: 3.7, 3.8, 3.9
-# 4.0: 3.7, 3.8, 3.9
+# 2.2: 3.7, 3.8, 3.9, 3.10
+# 3.2: 3.7, 3.8, 3.9, 3.10
+# 4.0: 3.7, 3.8, 3.9, 3.10
 
 [tox]
 envlist =
     py37-{2.2,3.2,4.0}.X,
     py38-{2.2,3.2,4.0}.X,
     py39-{2.2,3.2,4.0}.X,
-    py39-coverage
+    py310-{2.2,3.2,4.0}.X,
+    py310-coverage,
     docs,
     qunit
 
@@ -18,6 +19,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
 
 [testenv]
 passenv = TRAVIS DISPLAY
@@ -31,7 +33,7 @@ whitelist_externals = make
 commands =  make fetch-static-libs build-css build-js
             {envpython} runtests.py
 
-[testenv:py39-coverage]
+[testenv:py310-coverage]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH DISPLAY
 whitelist_externals = make
 commands = make fetch-static-libs build-css build-js
@@ -43,13 +45,13 @@ deps = coverage>=4
        selenium
 
 [testenv:docs]
-basepython = python3.9
-deps = Sphinx==1.6.5
+basepython = python3.10
+deps = Sphinx==4.3.0
        caktus-sphinx-theme==0.1.0
 commands = {envbindir}/sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html
 
 [testenv:qunit]
-basepython = python3.9
+basepython = python3.10
 skip_install = true
 deps =
 whitelist_externals = make