Switch to upstream with only translations added

.github/workflows/test.yml

@@ -4,10 +4,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
-          python-version: '3.6'
+          python-version: '3.10'
       - name: Install requirements
         run: pip install flake8 pycodestyle
       - name: Check syntax
@@ -17,7 +17,7 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        ckan-version: [2.9, 2.9-py2, 2.8, 2.7]
+        ckan-version: ["2.10", 2.9]
       fail-fast: false
 
     name: CKAN ${{ matrix.ckan-version }}
@@ -26,7 +26,7 @@ jobs:
       image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
     services:
       solr:
-        image: ckan/ckan-solr-dev:${{ matrix.ckan-version }}
+        image: ckan/ckan-solr:${{ matrix.ckan-version }}
       postgres:
         image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
         env:
@@ -44,7 +44,7 @@ jobs:
       CKAN_REDIS_URL: redis://redis:6379/1
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install requirements
       run: |
         pip install -r requirements.txt
@@ -53,16 +53,10 @@ jobs:
         # Replace default path to CKAN core config file with the one on the container
         sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
     - name: Setup extension (CKAN >= 2.9)
-      if: ${{ matrix.ckan-version != '2.7' && matrix.ckan-version != '2.8' }}
       run: |
         ckan -c test.ini db init
-    - name: Setup extension (CKAN < 2.9)
-      if: ${{ matrix.ckan-version == '2.7' || matrix.ckan-version == '2.8' }}
-      run: |
-        paster --plugin=ckan db init -c test.ini
     - name: Run tests
       run: pytest --ckan-ini=test.ini --cov=ckanext.showcase --cov-report=xml --cov-append --disable-warnings ckanext/showcase/tests
-
     - name: Upload coverage report to codecov
       uses: codecov/codecov-action@v1
       with:

.gitignore

@@ -13,7 +13,6 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
-build/
 develop-eggs/
 sdist/
 *.egg-info/

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Ckanext-showcase CHANGELOG
 
+## v1.6.0 2023-02-14
+
+* Dropped support for CKAN 2.7 and 2.8
+* Dropped support for Python 2
+* Add support for CSRF token
+* Sanitize blueprint names. All views should be called using `showcase_blueprint.<endpoint>`
+* Rename get_showcase_wysiwyg_editor to avoid name clashes with other extensions (like `ckanext-pages`)
+* Update CKEditor to it's latest version: 36.0.1
+
+## v1.5.1 2022-08-10
+
+* Dependency update
+
+## v1.5.0 2022-04-20
+
+* Support for CKAN 2.10 (#143)
+* Fix message in Add to showcase button (#139)
+
+## v1.4.8 2022-01-17
+
+* Add Chinese (Traditional, Taiwan) translations (#136)
+* Dependency update
+
+## v1.4.7 2022-01-04
+
+* Fix ReST in README (#133)
+* Move minimal requirements into setup.py (#134)
+
+## v1.4.6 2022-01-04
+
+* Fix version in setup.py and add to changelog (#130)
+
+## v1.4.5 2021-11.25
+
+* Add German and French translations (#124, #126)
+* Fix logic for API routes (#128)
+* Dependency updates
+
 ## v1.4.4 2021-08-17
 
 * Fix hardcoded route (#118)

README.rst

@@ -30,14 +30,9 @@ ckanext-showcase is intended to be a more powerful replacement for the
 Requirements
 ------------
 
+Tested on CKAN 2.9 and 2.10.
 
-Compatible with CKAN 2.9.
-
-N.B. The ``migrate`` command, detailed below, requires the Related Item models
-and actions, which have been removed in CKAN 2.6. If you wish to migrate your
-Related Items, please first upgrade CKAN to 2.5, do the migration, then
-continue upgrading to CKAN 2.6+.
-
+Note: Use `1.5.2` for older CKAN versions (2.7 and 2.8).
 
 ------------
 Installation
@@ -75,7 +70,7 @@ do::
 
     git clone https://github.com/ckan/ckanext-showcase.git
     cd ckanext-showcase
-    python setup.py develop
+    pip install -e .
     pip install -r dev-requirements.txt
 
 
@@ -86,11 +81,14 @@ repository contains all the files needed to edit and customize it if needed::
     npm install
     npx webpack --config webpack.config.js
 
-The webpack will use as entrypoint a file located in `ckanext/showcase/fanstatic/src/ckeditor.js`,
-create a build and save it to `ckanext/showcase/fanstatic/dist/ckeditor.js`
+Build anatomy
+ * assets/build/ckeditor.js - The ready-to-use editor bundle, containing the editor and all plugins.
+ * assets/js/showcase-editor - The CKAN module that will load and config the bundle when using it as data-module attribute.
+ * assets/src/ckeditor.js - The source entry point of the build. Based on it the build/ckeditor.js file is created by webpack. It defines the editor creator, the list of plugins and the default configuration of a build.
+ * webpack.config.js - The webpack configuration used to build the editor.
 
 More info on how to build CKEditor from source:
-https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/advanced-setup.html#scenario-2-building-from-source
+https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/quick-start-other.html#building-the-editor-from-source
 
 
 ---
@@ -157,30 +155,6 @@ The Showcase extension adds the following pages to the user interface:
 * To add a Showcase Admin : ``http://127.0.0.1:5000/ckan-admin/showcase_admins``
 
 
-----------------------------
-Migrating from Related Items
-----------------------------
-
-If you already have Related Items in your database, you can use the ``showcase
-migrate`` command to create Showcases from Related Items.
-
-From the ``ckanext-showcase`` directory::
-
-    paster showcase migrate -c {path to production.ini}
-
-Note that each Related Item must have a unique title before migration can
-proceed. If you prefer resolving duplicates as showcases, you can use the --allow-duplicates
-option to migrate them anyways. Duplicate Relations will be created as
-'duplicate_' + original_related_title + '_' + related_id
-
-    paster showcase migrate -c {path to production.ini} --allow-duplicates
-
-The Related Item property ``type`` will become a Showcase tag. The Related Item
-properties ``created``, ``owner_id``, ``view_count``, and ``featured`` have no
-equivalent in Showcases and will not be migrated.
-
-Related Item data is not removed from the database by this command.
-
 ---------------------
 Configuration
 ---------------------
@@ -199,20 +173,15 @@ HTML you can use the ```showcase markdown_to_html``` command.
 
 From the ``ckanext-showcase`` directory::
 
-    paster showcase markdown-to-html -c {path to production.ini}
+    ckan -c {path to production.ini} showcase markdown-to-html
 
 -----------------
 Running the Tests
 -----------------
 
 To run the tests, do::
 
-    nosetests --ckan --nologcapture --with-pylons=test.ini
-
-To run the tests and produce a coverage report, first make sure you have
-coverage installed in your virtualenv (``pip install coverage``) then run::
-
-    nosetests --ckan --nologcapture --with-pylons=test.ini --with-coverage --cover-package=ckanext.showcase --cover-inclusive --cover-erase --cover-tests
+    pytest --ckan-ini=test.ini ckanext/showcase/tests
 
 
 ------------------------------------
@@ -288,3 +257,4 @@ See: "Internationalizing strings in extensions" : http://docs.ckan.org/en/latest
 3. Compile your language catalog ( You can force pybabel compile to compile messages marked as fuzzy with the -f)
 
        python setup.py compile_catalog -f -l es
+