Update supported versions (#29)

* Update supported versions

* Update minimum required version

* Modernize code

* Modernize code

* Ignore lock

* Update ruff and mypy

Author: odarbelaeze

.github/workflows/cd.yml

@@ -20,7 +20,7 @@ jobs:
         uses: astral-sh/setup-uv@v2
         with:
           enable-cache: true
-          version: "0.4.9"
+          version: "0.5.7"
 
       - name: Install dependencies
         run: |

.github/workflows/ci.yml

@@ -13,11 +13,11 @@ jobs:
     name: CI for ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     env:
-      USING_COVERAGE: "3.8,3.12"
+      USING_COVERAGE: "3.9,3.13"
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
         uses: astral-sh/setup-uv@v2
         with:
           enable-cache: true
-          version: "0.4.9"
+          version: "0.5.7"
 
       - name: Run tests for ${{ matrix.python-version }}
         run: |

.gitignore

@@ -159,3 +159,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 *.xlsx
+uv.lock

.pre-commit-config.yaml

@@ -7,14 +7,14 @@ repos:
       - id: check-yaml
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.3
+    rev: v0.8.2
     hooks:
       # Run the linter.
       - id: ruff
         args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.9.0'
+    rev: 'v1.13.0'
     hooks:
     -   id: mypy

pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "typer[all]~=0.9.0",
     "xlsxwriter~=3.2.0",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 
 [project.optional-dependencies]
@@ -33,7 +33,7 @@ dev = [
 bibx = "bibx.cli:app"
 
 [tool.ruff.lint]
-select = ["I", "E", "F", "W"]
+select = ["I", "E", "F", "UP", "W"]
 ignore = ["E501"]
 
 [tool.mypy]

src/bibx/__init__.py

@@ -21,7 +21,7 @@
     "read_any",
 ]
 
-__version__ = "0.1.1"
+__version__ = "0.2.0"
 
 
 def read_scopus_bib(*files: TextIO) -> Collection:

src/bibx/_entities/article.py

@@ -1,10 +1,11 @@
+from collections.abc import Mapping
 from dataclasses import dataclass, field
-from typing import List, Mapping, Optional, Set
+from typing import Optional
 
 
 @dataclass
 class Article:
-    authors: List[str] = field(default_factory=list)
+    authors: list[str] = field(default_factory=list)
     year: Optional[int] = None
     title: Optional[str] = None
     journal: Optional[str] = None
@@ -14,9 +15,9 @@ class Article:
     doi: Optional[str] = None
     _label: Optional[str] = None
     times_cited: Optional[int] = None
-    references: List["Article"] = field(default_factory=list)
-    keywords: List[str] = field(default_factory=list)
-    sources: Set[str] = field(default_factory=set)
+    references: list["Article"] = field(default_factory=list)
+    keywords: list[str] = field(default_factory=list)
+    sources: set[str] = field(default_factory=set)
     extra: Mapping = field(default_factory=dict)
 
     @property

src/bibx/_entities/collection.py

@@ -1,7 +1,7 @@
 import datetime
 import logging
+from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Dict, Iterable, List, Tuple
 
 from bibx._entities.article import Article
 
@@ -10,7 +10,7 @@
 
 @dataclass
 class Collection:
-    articles: List[Article]
+    articles: list[Article]
 
     def merge(self, other: "Collection") -> "Collection":
         """
@@ -38,7 +38,7 @@ def all_articles(self) -> Iterable[Article]:
         yield from cache.values()
 
     @property
-    def citation_pairs(self) -> Iterable[Tuple[Article, Article]]:
+    def citation_pairs(self) -> Iterable[tuple[Article, Article]]:
         cache = {article.key: article for article in self.articles}
         for article in self.articles:
             if not article.references:
@@ -62,7 +62,7 @@ def _first_year(self) -> int:
             [article.year for article in self.articles if article.year is not None]
         )
 
-    def published_by_year(self) -> Dict[int, int]:
+    def published_by_year(self) -> dict[int, int]:
         """
         Returns a dictionary where the key is the year of publication and the value is the number of articles
         published that year. The dictionary starts from the oldest article to the current year consecutively.
@@ -84,7 +84,7 @@ def published_by_year(self) -> Dict[int, int]:
                 years[article.year] = 1
         return years
 
-    def cited_by_year(self) -> Dict[int, int]:
+    def cited_by_year(self) -> dict[int, int]:
         """
         Returns a dictionary where the key is the year of publication and the value is the number of
         citations in that year. The dictionary starts from the oldest article to the current year consecutively.

src/bibx/_entities/collection_builders/scopus_bib.py

@@ -1,7 +1,8 @@
 import json
 import re
+from collections.abc import Iterable
 from contextlib import suppress
-from typing import Iterable, Optional, TextIO
+from typing import Optional, TextIO
 
 import bibtexparser
 

src/bibx/_entities/collection_builders/scopus_ris.py

@@ -1,7 +1,8 @@
 import logging
 import re
 from collections import defaultdict
-from typing import Dict, Iterable, List, Optional, TextIO, Tuple
+from collections.abc import Iterable
+from typing import Optional, TextIO
 
 from bibx._entities.article import Article
 from bibx._entities.collection import Collection
@@ -18,7 +19,7 @@ def _size(file) -> int:
     return size
 
 
-def _int_or_nothing(raw: Optional[List[str]]) -> Optional[int]:
+def _int_or_nothing(raw: Optional[list[str]]) -> Optional[int]:
     if not raw:
         return None
     try:
@@ -27,7 +28,7 @@ def _int_or_nothing(raw: Optional[List[str]]) -> Optional[int]:
         return None
 
 
-def _joined(raw: Optional[List[str]]) -> Optional[str]:
+def _joined(raw: Optional[list[str]]) -> Optional[str]:
     if not raw:
         return None
     return " ".join(raw)
@@ -48,7 +49,7 @@ def _get_articles_from_files(self) -> Iterable[Article]:
             yield from self._parse_file(file)
 
     @staticmethod
-    def _find_volume_info(ref: str) -> Tuple[Dict[str, str], str]:
+    def _find_volume_info(ref: str) -> tuple[dict[str, str], str]:
         volume_pattern = re.compile(r"(?P<volume>\d+)( \((?P<issue>.+?)\))?")
         page_pattern = re.compile(r"(pp?\. (?P<page>\w+)(-[^,\s]+)?)")
         page = page_pattern.search(ref)
@@ -79,7 +80,7 @@ def _find_volume_info(ref: str) -> Tuple[Dict[str, str], str]:
         return data, ref[last_index:]
 
     @staticmethod
-    def _find_doi(ref: str) -> Tuple[Optional[str], str]:
+    def _find_doi(ref: str) -> tuple[Optional[str], str]:
         pattern = re.compile(
             r"((doi.org\/)|(aps.org\/doi\/)|(DOI:?)) ?(?P<doi>[^\s,;:]{5,})", re.I
         )
@@ -113,7 +114,7 @@ def _article_form_reference(cls, scopusref: str) -> Article:
         )
 
     @classmethod
-    def _parse_references(cls, refs: List[str]) -> List[Article]:
+    def _parse_references(cls, refs: list[str]) -> list[Article]:
         if not refs:
             return []
         result = []
@@ -125,7 +126,7 @@ def _parse_references(cls, refs: List[str]) -> List[Article]:
         return result
 
     @staticmethod
-    def _ris_to_dict(record: str) -> Dict[str, List[str]]:
+    def _ris_to_dict(record: str) -> dict[str, list[str]]:
         RIS_PATTERN = re.compile(
             r"^(((?P<key>[A-Z0-9]{2}))[ ]{2}-[ ]{1})?(?P<value>(.*))$"
         )
@@ -177,7 +178,7 @@ def _article_from_record(cls, record: str) -> Article:
     @classmethod
     def _parse_file(cls, file: TextIO) -> Iterable[Article]:
         if not _size(file):
-            return []
+            return
         for item in file.read().split("\n\n"):
             if item.isspace():
                 continue