ebird-api-data 0.3.5__tar.gz → 0.3.7__tar.gz

{ebird_api_data-0.3.5 → ebird_api_data-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ebird-api-data
-Version: 0.3.5
+Version: 0.3.7
 Summary: eBird API Data is a reusable Django app for loading data from eBird into a database.
 Author-email: Stuart MacKay <smackay@flagstonesoftware.com>
 License-Expression: MIT

{ebird_api_data-0.3.5 → ebird_api_data-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ebird-api-data"
-version = "0.3.5"
+version = "0.3.7"
 description = "eBird API Data is a reusable Django app for loading data from eBird into a database."
 keywords = ["checklists", "observations", "species", "Django", "eBird", "models"]
 license = "MIT"
@@ -65,7 +65,7 @@ dev-dependencies = [
 ]
 
 [tool.bumpversion]
-current_version = "0.3.5"
+current_version = "0.3.7"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 ignore_missing_version = false

ebird_api_data-0.3.7/src/ebird/api/data/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.7"

{ebird_api_data-0.3.5 → ebird_api_data-0.3.7}/src/ebird/api/data/admin.py

@@ -44,18 +44,6 @@ class ObservationInline(admin.TabularInline):
             .order_by("species__taxon_order")
         )
 
-class ProtocolListFilter(admin.SimpleListFilter):
-    title = _("protocol")
-    parameter_name = "protocol_code"
-
-    def lookups(self, request, model_admin):
-        return [(key, value) for key, value in Checklist.Protocol.NAMES.items()]
-
-    def queryset(self, request, queryset):
-        if value := self.value():
-            return queryset.filter(protocol_code=value)
-
-
 @admin.register(models.Checklist)
 class ChecklistAdmin(admin.ModelAdmin):
     list_display = (
@@ -66,7 +54,6 @@ class ChecklistAdmin(admin.ModelAdmin):
         "location",
         "observer",
     )
-    list_filter = [ProtocolListFilter]
     ordering = ("-started",)
     search_fields = ("identifier", "location__name", "observer__name")
     autocomplete_fields = ("location", "observer")

{ebird_api_data-0.3.5 → ebird_api_data-0.3.7}/src/ebird/api/data/loaders.py

@@ -396,9 +396,6 @@ class APILoader:
             if area := data.get("effortAreaHa"):
                 values["area"] = round(Decimal(area), 3)
 
-            if data["protocolId"] not in Checklist.Protocol.NAMES.keys():
-                logger.info("New protocol: %s", data["protocolId"])
-
             if "comments" in data:
                 values["comments"] = data["comments"]
 

{ebird_api_data-0.3.5 → ebird_api_data-0.3.7}/src/ebird/api/data/models/checklist.py

@@ -1,32 +1,19 @@
+from enum import StrEnum
+
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 
 class Checklist(models.Model):
-    class Protocol:
-        INCIDENTAL = "P20"  # Birding is not the primary purpose
-        STATIONARY = "P21"  # Move less than 30m (100ft)
-        TRAVELING = "P22"  # Move more than 30m (100ft)
-        AREA = "P23"  # Complete coverage of an area
-        BANDING = "P33"  # Banding/ringing
-        NOCTURNAL = "P54"  # Nocturnal Flight Call Count
-        PELAGIC = "P60"  # Birding from a boat, 2+ miles from land
-        HISTORICAL = "P62"  # Start time, duration or distance not known
-        COMMON_BIRD_SURVEY = "P67"  # Stationary, two-band: <25m, >25m
-        DIRECTIONAL = "P68"  # Stationary, note cardinal direction: N, S, E, W
-
-        NAMES = {
-            INCIDENTAL: _("Incidental"),
-            STATIONARY: _("Stationary"),
-            TRAVELING: _("Traveling"),
-            AREA: _("Area"),
-            BANDING: _("Banding"),
-            NOCTURNAL: _("Nocturnal Flight Call Count"),
-            PELAGIC: _("Pelagic"),
-            HISTORICAL: _("Historical"),
-            COMMON_BIRD_SURVEY: _("Common Bird Survey"),
-            DIRECTIONAL: _("Stationary (directional)"),
-        }
+    class Protocol(StrEnum):
+        INCIDENTAL = "P20"
+        STATIONARY = "P21"
+        TRAVELING = "P22"
+        AREA = "P23"
+        BANDING = "P33"
+        NOCTURNAL = "P54"
+        PELAGIC = "P60"
+        HISTORICAL = "P62"
 
     class Meta:
         verbose_name = _("checklist")
@@ -141,9 +128,6 @@ class Checklist(models.Model):
         help_text=_("The code used to identify the protocol."),
     )
 
-    # Protocol is not used to set the choices, as we still want to load
-    # the checklist when a protocol not defined in the class is used.
-
     project_code = models.TextField(
         blank=True,
         verbose_name=_("project code"),
@@ -213,6 +197,3 @@ class Checklist(models.Model):
 
     def __str__(self) -> str:
         return str(self.identifier)
-
-    def get_protocol(self):
-        return self.Protocol.NAMES.get(self.protocol_code, "")

ebird_api_data-0.3.5/src/ebird/api/data/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.5"