Merge branch '0.3.6' into 'main'

merge 0.3.6

See merge request osti/elink2/elink2python!5

Author: nensor

CHANGELOG.md

@@ -29,4 +29,10 @@
 - fix bug in POST media uploads for files not opening properly
 - added Query support for pagination in response to API query_records endpoint
 - add documentation README for new Query pagination
-- fix various test cases
+- fix various test cases
+
+## 0.3.6 - 09/27/2024
+- change date field names: date_metadata_added, date_metadata_updated for consistency
+- update requirements to include requests-toolbelt properly, and indicate python >=3.9 versioning
+- remove deprecated/legacy product types from Record definition
+- modified Person requirements to reflect only type and last_name requirements

pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elinkapi"
-version = "0.3.5" 
+version = "0.3.7" 
 authors = [
   { name="Jacob Samar", email="samarj@osti.gov" },
   { name="Neal Ensor", email="ensorn@osti.gov" }
 ]
 description = "OSTI E-Link 2 API package"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: BSD License",
@@ -20,7 +20,8 @@ classifiers = [
 dependencies = [
     "requests", 
     "pydantic", 
-    "urllib3"
+    "urllib3",
+    "requests_toolbelt"
 ]
 
 [project.optional-dependencies]

src/elinkapi/organization.py

@@ -32,7 +32,7 @@ class Contribution(Enum):
         RightsHolder="RightsHolder"
         Sponsor="Sponsor"
         Supervisor="Supervisor"
-        WorkfPackageLeader="WorkPackageLeader"
+        WorkPackageLeader="WorkPackageLeader"
         Other="Other"
 
     type:str

src/elinkapi/person.py

@@ -29,7 +29,7 @@ class Contribution(Enum):
         Researcher="Researcher"
         RightsHolder="RightsHolder"
         Supervisor="Supervisor"
-        WorkfPackageLeader="WorkPackageLeader"
+        WorkPackageLeader="WorkPackageLeader"
         Other="Other"
 
     type: str

src/elinkapi/record.py

@@ -83,13 +83,7 @@ class ProductType(Enum):
     SoftwareManual="SM"
     ThesisDissertation="TD"
     TechnicalReport="TR"
-    DataCollection="DC"
-    DataProject="DP"
-    EngineeringDrawing="ED"
-    LegalDocument="LD"
-    NewsStory="NS"
     PatentApplication="PA"
-    SerialPublication="SP"
 
 class Record(BaseModel):
     model_config = ConfigDict(validate_assignment=True)
@@ -234,8 +228,8 @@ class RecordResponse(Record):
     added_by: int = None
     edited_by: int = None
     collection_type: str = None   
-    date_added: datetime.datetime = None
-    date_updated: datetime.datetime = None
+    date_metadata_added: datetime.datetime = None
+    date_metadata_updated: datetime.datetime = None
     date_submitted_to_osti_first: datetime.datetime = None
     date_submitted_to_osti_last: datetime.datetime = None
     hidden_flag: str = None