Merge pull request #9 from aboutcode-org/patch-release@v0.0.4

404-geek · web-flow · commit 6f6bc91bc274 · 2025-07-12T23:14:41.000-04:00
Update PackageScoreMixin with score date parsing
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -24,3 +24,8 @@ v0.0.3 - 2025-02-24
 --------------------
 
 Patch Release of scorecode to fix checks in scorecard data.
+
+v0.0.4 - 2025-07-12
+--------------------
+
+Added parsing score date functionality to `PackageScoreMixin`
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -43,7 +43,7 @@
 
 # This points to aboutcode.readthedocs.io
 # In case of "undefined label" ERRORS check docs on intersphinx to troubleshoot
-# Link was created at commit - https://github.com/nexB/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
+# Link was created at commit - https://github.com/aboutcode-org/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
 
 intersphinx_mapping = {
     "aboutcode": ("https://aboutcode.readthedocs.io/en/latest/", None),
diff --git a/docs/source/contribute/contrib_doc.rst b/docs/source/contribute/contrib_doc.rst
@@ -12,7 +12,7 @@ To get started, create or identify a working directory on your local machine.
 
 Open that directory and execute the following command in a terminal session::
 
-    git clone https://github.com/nexB/skeleton.git
+    git clone https://github.com/aboutcode-org/skeleton.git
 
 That will create an ``/skeleton`` directory in your working directory.
 Now you can install the dependencies in a virtualenv::
diff --git a/docs/source/skeleton-usage.rst b/docs/source/skeleton-usage.rst
@@ -118,7 +118,7 @@ corrected. You can check to see if your corrections are valid by running:
 Once the wheels are collected and the ABOUT files are generated and correct,
 upload them to thirdparty.aboutcode.org/pypi by placing the wheels and ABOUT
 files from the thirdparty directory to the pypi directory at
-https://github.com/nexB/thirdparty-packages
+https://github.com/aboutcode-org/thirdparty-packages
 
 
 Usage after project initialization
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,52 @@
+[build-system]
+requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 6"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+# this is used populated when creating a git archive
+# and when there is .git dir and/or there is no git installed
+fallback_version = "9999.$Format:%h-%cs$"
+
+[tool.pytest.ini_options]
+norecursedirs = [
+   ".git",
+   "bin",
+   "dist",
+   "build",
+   "_build",
+   "dist",
+   "etc",
+   "local",
+   "ci",
+   "docs",
+   "man",
+   "share",
+   "samples",
+   ".cache",
+   ".settings",
+   "Include",
+   "include",
+   "Lib",
+   "lib",
+   "lib64",
+   "Lib64",
+   "Scripts",
+   "thirdparty",
+   "tmp",
+   "venv",
+   "tests/data",
+   ".eggs",
+   "src/*/data",
+   "tests/*/data"
+]
+
+python_files = "*.py"
+
+python_classes = "Test"
+python_functions = "test"
+
+addopts = [
+    "-rfExXw",
+    "--strict-markers",
+    "--doctest-modules"
+]
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = scorecode
-version = 0.0.3
+version = 0.0.4
 license = Apache-2.0
 description = A package to fetch data from OpenSSF Scorecard API
 long_description = file:README.rst
diff --git a/src/README.rst b/src/README.rst
@@ -0,0 +1,2 @@
+Put your Python source code (and installable data) in this directory.
+
diff --git a/src/scorecode/contrib/django/models.py b/src/scorecode/contrib/django/models.py
@@ -6,8 +6,11 @@
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
-from django.core.exceptions import ValidationError
+
+from datetime import datetime
+
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 
@@ -59,6 +62,26 @@ class ScoringTool(models.TextChoices):
         help_text=_("Date when the scoring was calculated on the package"),
     )
 
+    @classmethod
+    def parse_score_date(cls, date_str, formats=None):
+        """
+        Parse a date string into a timezone-aware datetime object,
+        or return None if parsing fails.
+        """
+
+        if not formats:
+            formats = ["%Y-%m-%d", "%Y-%m-%dT%H:%M:%SZ"]
+
+        if date_str:
+            for fmt in formats:
+                try:
+                    naive_datetime = datetime.strptime(date_str, fmt)
+                    return timezone.make_aware(naive_datetime, timezone.get_current_timezone())
+                except ValueError:
+                    continue
+
+        return None
+
     class Meta:
         abstract = True
 
diff --git a/src/scorecode/ossf_scorecard.py b/src/scorecode/ossf_scorecard.py
@@ -47,7 +47,7 @@ def is_available():
     return response.ok
 
 
-def fetch_scorecard_info(package, logger):
+def fetch_scorecard_info(package, logger=None):
     """
     Return scorecard info for a list of discovered packages.
     """
diff --git a/tests/README.rst b/tests/README.rst
@@ -0,0 +1,2 @@
+Put your Python test modules in this directory.
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Put your Python source code (and installable data) in this directory.`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Put your Python test modules in this directory.`
	`2`	`+`