Merge branch 'ellmetha:main' into default_approval_status

bioworkflows · Oct 16, 2023 · 2387e1e · 2387e1e
2 parents 9a05649 + 6586d26
commit 2387e1e
Show file tree

Hide file tree

Showing 40 changed files with 3,973 additions and 1,748 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,31 +36,30 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [
-          3.6,
           3.7,
           3.8,
           3.9,
           '3.10',
+          '3.11',
         ]
         django-version: [
           "django>=3.2,<4.0",
           "django>=4.0,<4.1",
-          "django>=4.1,<4.2"
+          "django>=4.1,<4.2",
+          "django>=4.2,<5.0",
         ]
         db: [
           'mysql',
           'postgres',
           'sqlite',
         ]
         exclude:
-          - python-version: 3.6
-            django-version: "django>=4.0,<4.1"
           - python-version: 3.7
             django-version: "django>=4.0,<4.1"
-          - python-version: 3.6
-            django-version: "django>=4.1,<4.2"
           - python-version: 3.7
             django-version: "django>=4.1,<4.2"
+          - python-version: 3.7
+            django-version: "django>=4.2,<5.0"
 
     steps:
     - uses: actions/checkout@v2
@@ -82,15 +81,6 @@ jobs:
     - name: Run QA checks
       run: make qa
     - name: Run tests suite
-      run: poetry run pytest --cov-report xml --cov machina
+      run: poetry run pytest
       env:
         DB: ${{ matrix.db }}
-    - name: Upload coverage to Codecov
-      if: matrix.python-version == 3.9 && matrix.django-version == 'django>=3.2,<4.0' && matrix.db == 'sqlite'
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage.xml
-        flags: unittests
-        name: codecov-umbrella
-        fail_ci_if_error: true
diff --git a/.tx/config b/.tx/config
@@ -1,9 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[django-machina.machina]
+[o:django-machina-team:p:django-machina:r:machina]
 file_filter = machina/locale/<lang>/LC_MESSAGES/django.po
 source_file = machina/locale/en/LC_MESSAGES/django.po
 source_lang = en
-type = PO
+type        = PO
 
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022, Morgan Aubert and contributors.
+Copyright (c) 2013-2023, Morgan Aubert and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.rst b/README.rst
@@ -16,7 +16,6 @@
         <a href="https://pypi.python.org/pypi/django-machina" rel="nofollow"><img src="https://img.shields.io/pypi/pyversions/django-machina.svg" style="max-width:100%;"></a>
         <a href="https://pypi.python.org/pypi/django-machina/" rel="nofollow"><img alt="Latest Version" src="https://img.shields.io/pypi/v/django-machina.svg" style="max-width:100%;"></a>
         <a href="https://github.com/ellmetha/django-machina/actions" rel="nofollow"><img alt="Build status" src="https://github.com/ellmetha/django-machina/workflows/CI/badge.svg?branch=main&event=push" style="max-width:100%;"></a>
-        <a href="https://codecov.io/github/ellmetha/django-machina" rel="nofollow"><img alt="Codecov status" src="https://codecov.io/gh/ellmetha/django-machina/branch/main/graph/badge.svg" style="max-width:100%;"></a>
     </p>
 
 |

diff --git a/docs/conf.py b/docs/conf.py
@@ -65,9 +65,9 @@
 #
 
 # The short X.Y version.
-version = '1.2.1.dev'
+version = '1.3.1.dev'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.1.dev'
+release = '1.3.1.dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/release_notes/v1.3.rst b/docs/release_notes/v1.3.rst
@@ -1,13 +1,18 @@
-####################################################
-Django-machina 1.3 release notes (UNDER DEVELOPMENT)
-####################################################
+#############################################
+Django-machina 1.3 release notes (2023-05-27)
+#############################################
 
 Requirements and compatibility
 ------------------------------
 
-Python 3.6, 3.7, 3.8, 3.9 and 3.10. Django 3.2, 4.0, and 4.1.
+Python 3.6, 3.7, 3.8, 3.9, 3.10, and 3.11. Django 3.2, 4.0, 4.1, and 4.2.
 
 Major changes
 -------------
 
 * It is now possible to explicitly configure that poll results should be hidden when creating topics (`#280 <https://github.com/ellmetha/django-machina/pull/280>`_)
+
+Minor changes
+-------------
+
+* The ``get_class`` function now supports apps that are defined in ``INSTALLED_APPS`` using dotted paths to configuration classes, such as ``machina.forum_tracking.apps.ForumTrackingAppConfig`` for example (`#288 <https://github.com/ellmetha/django-machina/pull/288>`_)
diff --git a/machina/locale/ar/LC_MESSAGES/django.po b/machina/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-machina\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-13 08:56-1000\n"
+"POT-Creation-Date: 2023-02-19 16:58-0500\n"
 "PO-Revision-Date: 2020-04-26 17:48+0000\n"
 "Last-Translator: Brahim Bouslim <[email protected]>\n"
 "Language-Team: Arabic (http://www.transifex.com/django-machina-team/django-machina/language/ar/)\n"

diff --git a/machina/locale/ca/LC_MESSAGES/django.po b/machina/locale/ca/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-machina\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-13 08:56-1000\n"
+"POT-Creation-Date: 2023-02-19 16:58-0500\n"
 "PO-Revision-Date: 2016-02-23 03:25+0000\n"
 "Last-Translator: \n"
 "Language-Team: Catalan (http://www.transifex.com/django-machina-team/django-machina/language/ca/)\n"

diff --git a/machina/locale/cs/LC_MESSAGES/django.mo b/machina/locale/cs/LC_MESSAGES/django.mo