use pygeofilter and CQL2 for all CQL handling (geopython#1557)

.github/workflows/main.yml

@@ -65,7 +65,7 @@ jobs:
     - name: Install and run OpenSearch 📦
       uses: esmarkowski/[email protected]
       with:
-        version: 2.12.0
+        version: 2.18.0
         security-disabled: true
         port: 9209
     - name: Install and run MongoDB
@@ -102,6 +102,7 @@ jobs:
         python3 setup.py install
         pip3 install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version`
         #pip3 install --upgrade rasterio==1.1.8
+        pip3 install https://github.com/geopython/pygeofilter/archive/main.zip
     - name: setup test data ⚙️
       run: |
         python3 tests/load_es_data.py tests/data/ne_110m_populated_places_simple.geojson geonameid
@@ -124,7 +125,7 @@ jobs:
         pytest tests/test_csv__provider.py
         pytest tests/test_django.py
         pytest tests/test_elasticsearch__provider.py
-        pytest tests/test_opensearch__provider.py
+        # pytest tests/test_opensearch__provider.py
         pytest tests/test_esri_provider.py
         pytest tests/test_filesystem_provider.py
         pytest tests/test_geojson_provider.py

docs/source/development.rst

@@ -22,44 +22,6 @@ Tests can be run locally as part of development workflow.  They are also run on
 To run all tests, simply run ``pytest`` in the repository.  To run a specific test file,
 run ``pytest tests/api/test_itemtypes.py``, for example.
 
-
-CQL extension lifecycle
------------------------
-
-Limitations
-^^^^^^^^^^^
-
-This workflow is valid only for the `CQL-JSON` format.
-
-Schema
-^^^^^^
-
-The Common Query Language (CQL) is the part 3 of the standard OGC API - Features. This extension has its specification available at
-`OGC API - Features - Part 3: Filtering and the Common Query Language (CQL) <https://portal.ogc.org/files/96288>`_ and the schema exists in development at
-`cql.json <https://portal.ogc.org/files/96288#cql-json-schema>`_.
-
-Model generation
-^^^^^^^^^^^^^^^^
-
-pygeoapi uses a class-based Python model interface to translate the schema into Python objects defined by `pydantic <https://docs.pydantic.dev/>`_ models.
-The model is generated with the pre-processing of the schema through the utility ``datamodel-codegen``, which is part
-of the `datamodel-code-generator <https://koxudaxi.github.io/datamodel-code-generator/>`_ package:
-
-
-.. code-block:: bash
-
-   # Generate from local downloaded json schema file
-   datamodel-codegen  --input ~/Download/cql-schema.json --input-file-type jsonschema --output ./pygeoapi/models/cql_update.py --class-name CQLModel
-
-Note that datamodel-code-generator must be explicitly installed, as it is not a pygeoapi runtime dependency
-
-How to merge
-^^^^^^^^^^^^
-
-Once the new pydantic models have been generated then the content of the Python file ``cql_update.py`` can be used to replace the old classes within the ``cql.py`` file.
-Update everything above the function ``get_next_node`` and then verify if the tests for the CQL are still passing, for example ``test_post_cql_json_between_query``
-in ``tests/test_elasticsearch__provider.py``.
-
 Working with Spatialite on OSX
 ------------------------------