Merge pull request #201 from django-cms/release/2.0.x

fix: Port latest changes to master, brings back up to date with the latest changes

.eslintrc.js

@@ -8,6 +8,7 @@ module.exports = {
     },
     "globals": {
         "CMS": true,
+        "django": true,
         "Promise": true
     },
     "root": true,

.github/workflows/frontend.yml

@@ -0,0 +1,21 @@
+name: Frontend
+
+on: [push, pull_request]
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [6.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+    - run: npm install -g [email protected]
+    - run: |
+          gulp lint

.github/workflows/lint.yml

@@ -0,0 +1,38 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  flake8:
+    name: flake8
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install flake8
+        run: pip install --upgrade flake8
+      - name: Run flake8
+        uses: liskin/gh-problem-matcher-wrap@v1
+        with:
+          linters: flake8
+          run: flake8
+
+  isort:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - run: python -m pip install isort
+      - name: isort
+        uses: liskin/gh-problem-matcher-wrap@v1
+        with:
+          linters: isort
+          run: isort -c -rc -df ./

.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: CodeCov
+
+on: [push, pull_request]
+
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    env:
+      ENABLE_VERSIONING: 1
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ 3.7, 3.8, 3.9 ]  # latest release minus two
+        requirements-file: [
+            dj22_cms40.txt,
+            dj32_cms40.txt,
+        ]
+        os: [
+            ubuntu-20.04,
+        ]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r tests/requirements/${{ matrix.requirements-file }}
+        python setup.py install
+
+    - name: Run coverage
+      run: coverage run setup.py test
+
+    - name: Upload Coverage to Codecov
+      uses: codecov/codecov-action@v1

.gitignore

@@ -7,6 +7,11 @@
 dist/
 build/
 .env
+venv
 *.sqlite
 .coverage
 .python-version
+node_modules/
+yarn.lock
+docs/_build/
+venv*

CHANGELOG.rst

@@ -0,0 +1,20 @@
+=========
+Changelog
+=========
+
+Unreleased
+==========
+* Python 3.8, 3.9 support added
+* Django 3.0, 3.1 and 3.2 support added
+* Python 3.5 and 3.6 support removed
+* Django 1.11 support removed
+
+1.0.28 (2021-10-18)
+===================
+* Configuration options added to the cms_config to allow a third party to add fields and actions to the Moderation Request Changelist admin view.
+* Flake8 code formatting error fixes
+
+1.0.27 (2021-03-10)
+===================
+* Wrapped the publish view logic in a transaction to prevent inconsistent ModerationRequest states in the future.
+* Added a new management command: "moderation_fix_states" to repair any ModerationRequests left in an inconsistent state where the the is_active state is True, the ModerationRequest version object is published, and the collection is Archived.

README.rst

@@ -9,7 +9,7 @@ Installation
 Requirements
 ============
 
-django CMS Moderation requires that you have a django CMS 3.4.3 (or higher) project already running and set up.
+django CMS Moderation requires that you have a django CMS 4.0 (or higher) project already running and set up.
 
 
 To install
@@ -29,3 +29,15 @@ Run::
     python manage.py migrate djangocms_moderation
 
 to perform the application's database migrations.
+
+Documentation
+=============
+
+We maintain documentation under ``docs`` folder using rst format. HTML documentation can be generated using the following commands
+
+Run::
+
+    cd docs/
+    make html
+
+This should generate all html files from rst documents under the `docs/_build` folder, which can be browsed.

djangocms_moderation/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.0.7'
+__version__ = "1.0.28"
 
-default_app_config = 'djangocms_moderation.apps.ModerationConfig'
+default_app_config = "djangocms_moderation.apps.ModerationConfig"