style: automatic reformat

auto reformat with ruff/docformatter/prettier after config changes

ckanext/statistics/cli.py

@@ -4,7 +4,7 @@
 from ckan.plugins import toolkit
 from tqdm import tqdm
 
-from .model.gbif_download import gbif_downloads_table, GBIFDownload
+from .model.gbif_download import GBIFDownload, gbif_downloads_table
 
 
 def get_commands():
@@ -79,7 +79,7 @@ def get_gbif_stats(dataset_uuid, limit=100):
 
     :param dataset_uuid: the dataset uuid to get stats records for
     :param limit: the number of records to retrieve at once (default: 100)
-    :return: yields dicts
+    :returns: yields dicts
     """
     offset = 0
     url = f'https://api.gbif.org/v1/occurrence/download/dataset/{dataset_uuid}'

ckanext/statistics/lib/dataset_statistics.py

@@ -6,6 +6,7 @@
 
 
 import logging
+
 from ckan.lib.search import SearchIndexError
 from ckan.plugins import toolkit
 

ckanext/statistics/lib/download_statistics.py

@@ -8,13 +8,14 @@
 import json
 from collections import OrderedDict, defaultdict
 
+import ckan.model as model
+from ckan.plugins import toolkit
 from importlib_resources import files
 from sqlalchemy import sql
 
-import ckan.model as model
-from ckan.plugins import toolkit
 from ckanext.ckanpackager.model.stat import CKANPackagerStat
 from ckanext.versioned_datastore.model.downloads import DownloadRequest
+
 from ..lib.statistics import Statistics
 from ..logic.schema import statistics_downloads_schema
 from ..model.gbif_download import GBIFDownload
@@ -28,11 +29,11 @@ class MonthlyStats(object):
     """
 
     def __init__(self, month=None, year=None, resource_id=None):
-        '''
+        """
         :param month: if passed, only this month will be counted (defaults to None)
         :param year: if passed, only this year will be counted (defaults to None)
         :param resource_id: if passed, only this resource will be counted (defaults to None)
-        '''
+        """
         self.month = int(month) if month is not None else None
         self.year = int(year) if year is not None else None
         self.resource_id = resource_id
@@ -117,8 +118,8 @@ def update_from_backfill(self, month, year, stats):
 
         :param month: the month
         :param year: the year
-        :param stats: the stats in a dict, the format of this dict must match a month/year entry in
-                      the self.stats dict
+        :param stats: the stats in a dict, the format of this dict must match a
+            month/year entry in the self.stats dict
         """
         if self.month is not None and self.month != int(month):
             return
@@ -158,7 +159,7 @@ def as_dict(self):
         """
         Return an OrderedDict of count stats in ascending chronological order.
 
-        :return: an OrderedDict
+        :returns: an OrderedDict
         """
         return OrderedDict(
             sorted(

ckanext/statistics/model/gbif_download.py

@@ -5,8 +5,8 @@
 # Created by the Natural History Museum in London, UK
 
 
-from ckan.model import meta, DomainObject
-from sqlalchemy import Column, DateTime, Integer, func, Table, UnicodeText
+from ckan.model import DomainObject, meta
+from sqlalchemy import Column, DateTime, Integer, Table, UnicodeText, func
 
 gbif_downloads_table = Table(
     'gbif_downloads',

ckanext/statistics/plugin.py

@@ -8,6 +8,7 @@
 from ckan.plugins import SingletonPlugin, implements, interfaces
 
 from ckanext.statistics.logic.action import dataset_statistics, download_statistics
+
 from . import cli
 
 

docs/_scripts/gen_api_pages.py

@@ -1,6 +1,5 @@
 # !/usr/bin/env python
 # encoding: utf-8
-
 """
 Generate the code reference pages and navigation.
 

tests/test_download_statistics.py

@@ -7,18 +7,18 @@
 
 from collections import OrderedDict
 from datetime import datetime
+from unittest.mock import MagicMock, call
 
 import pytest
+
 from ckanext.ckanpackager.model.stat import CKANPackagerStat, ckanpackager_stats_table
 from ckanext.statistics.lib.download_statistics import DownloadStatistics, MonthlyStats
 from ckanext.statistics.model.gbif_download import GBIFDownload, gbif_downloads_table
-from ckanext.versioned_datastore.model import stats, slugs, details, downloads
+from ckanext.versioned_datastore.model import details, downloads, slugs, stats
 from ckanext.versioned_datastore.model.downloads import (
-    DownloadRequest,
     CoreFileRecord,
-    DerivativeFileRecord,
+    DownloadRequest,
 )
-from unittest.mock import MagicMock, call
 
 
 class TestMonthlyStats(object):
@@ -409,7 +409,6 @@ def test_add_ckanpackager_stats(self):
         assert call(datetime(2011, 12, 1), 'blarp', 0) in calls
 
     def test_add_versioned_datastore_download_stats(self):
-
         core_record_kwargs = {
             'query': {},
             'query_version': 'v12.4.9',
@@ -423,7 +422,7 @@ def test_add_versioned_datastore_download_stats(self):
             resource_hash='abcd',
             modified=datetime(2019, 1, 1),
             resource_totals={'resource1': 100, 'resource2': 32},
-            **core_record_kwargs
+            **core_record_kwargs,
         )
         core_record_1.save()
 
@@ -433,7 +432,7 @@ def test_add_versioned_datastore_download_stats(self):
             resource_hash='efgh',
             modified=datetime(2018, 5, 10),
             resource_totals={'resource1': 4},
-            **core_record_kwargs
+            **core_record_kwargs,
         )
         core_record_2.save()
 
@@ -443,7 +442,7 @@ def test_add_versioned_datastore_download_stats(self):
             resource_hash='ijkl',
             modified=datetime(2018, 4, 14),
             resource_totals={'resource3': 189},
-            **core_record_kwargs
+            **core_record_kwargs,
         )
         core_record_3.save()