Data model rework

.github/workflows/ci.yml

@@ -50,6 +50,7 @@ jobs:
           target: base
           build-args: |
             BASE_IMAGE=${{ env.BASE_IMAGE }}
+            PYTHESINT_VERSION=v1.7.3.dev0
           push: false
           load: true
           tags: testing
@@ -70,7 +71,7 @@ jobs:
              -e "GITHUB_RUN_ID=$GITHUB_RUN_ID"
              -e "GITHUB_TOKEN=$GITHUB_TOKEN"
              testing
-             bash -c "coverage run --omit=geospaas/nansat_ingestor/tests/*,geospaas/catalog/tests/*,geospaas/vocabularies/tests/* runtests.py"
+             bash -c "coverage run --omit='*/tests/*,*/tests.py,*/migrations/*' runtests.py"
 
       - name: 'Install Python 3.11'
         if: ${{ env.latest }}

Dockerfile

@@ -3,6 +3,7 @@ ARG BASE_IMAGE='nansencenter/nansat:latest'
 FROM ${BASE_IMAGE} as base
 LABEL purpose="Running and developing Django-Geo-SpaaS"
 ENV PYTHONUNBUFFERED=1
+ARG PYTHESINT_VERSION ''
 
 # Install Django
 RUN apt update \
@@ -21,7 +22,9 @@ RUN apt update \
     thredds_crawler==1.5.4 \
 &&  apt remove -y g++ && apt autoremove -y \
 &&  apt clean && rm -rf /var/lib/apt/lists/* \
-&&  echo "alias ll='ls -lh'" >> /root/.bashrc
+&&  echo "alias ll='ls -lh'" >> /root/.bashrc \
+&&  [ -n "${PYTHESINT_VERSION}" ] && pythesint_version_string="==${PYTHESINT_VERSION}" || pythesint_version_string='' \
+&&  pip install --no-cache-dir "pythesint${pythesint_version_string}"
 
 FROM base as full
 

docs/source/geospaas/catalog.rst

@@ -13,14 +13,6 @@ Subpackages
 Submodules
 ==========
 
-geospaas.catalog.managers
--------------------------
-
-.. automodule:: geospaas.catalog.managers
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 geospaas.catalog.models
 -----------------------
 

geospaas/base_viewer/forms.py

@@ -2,8 +2,6 @@
 from django.utils import timezone
 from leaflet.forms.widgets import LeafletWidget
 
-from geospaas.catalog.models import Source
-
 
 class BaseSearchForm(forms.Form):
     """ Basic version of form for basic seaching of django-geospaas metadata """
@@ -20,8 +18,6 @@ class BaseSearchForm(forms.Form):
     time_coverage_start = forms.DateTimeField(
         initial=timezone.datetime(2000, 1, 1, tzinfo=timezone.utc))
     time_coverage_end = forms.DateTimeField(initial=timezone.now())
-    source = forms.ModelMultipleChoiceField(
-        Source.objects.all(), required=False)
 
     def filter(self, ds):
         """ Filtering method of the form. All filtering processes are coded here """
@@ -34,12 +30,6 @@ def filter(self, ds):
         # Too late datasets are excluded from the filtering results
         ds = ds.exclude(time_coverage_start__gt=t_1)
 
-        src = self.cleaned_data.get('source', None)
-        # Just the one(s) with correct selected source should pass the filtering actions
-        # if Source is given in the input form
-        if src:
-            ds = ds.filter(source__in=src)
-
         # spatial filtering
         if self.cleaned_data['polygon']:
             # filtering by user provided polygon

geospaas/base_viewer/templates/base_viewer/ds_info.html

@@ -5,7 +5,7 @@
     {% endblock ds_detailed_info %}
     {% for url in ds.dataseturi_set.all %}
     <div class="attr_title">Address:</div>
-    {% if show_local_address or url.service != local_file_service %}
+    {% if show_local_address %}
     <div class="attr_content">{{ url.uri|escape|urlize}} </div>
     {% else %}
     <div class="attr_content">hidden local address of dataset</div>