Merge pull request #328 from Czarified/pd_update

Expand pandas support
Czarified · Jul 4, 2024 · 16d3edb · 16d3edb
2 parents 4b68e8d + 1a3d8f6
commit 16d3edb
Show file tree

Hide file tree

Showing 11 changed files with 919 additions and 677 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,19 +12,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { python: "3.11", os: "ubuntu-latest", session: "pre-commit" }
-          - { python: "3.11", os: "ubuntu-latest", session: "safety" }
+          - { python: "3.12", os: "ubuntu-latest", session: "pre-commit" }
+          - { python: "3.12", os: "ubuntu-latest", session: "safety" }
+          - { python: "3.12", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.11", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.10", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.9", os: "ubuntu-latest", session: "mypy" }
+          - { python: "3.12", os: "ubuntu-latest", session: "tests" }
           - { python: "3.11", os: "ubuntu-latest", session: "tests" }
           - { python: "3.10", os: "ubuntu-latest", session: "tests" }
           - { python: "3.9", os: "ubuntu-latest", session: "tests" }
-          - { python: "3.11", os: "windows-latest", session: "tests" }
-          - { python: "3.11", os: "macos-latest", session: "tests" }
-          - { python: "3.11", os: "ubuntu-latest", session: "typeguard" }
-          - { python: "3.11", os: "ubuntu-latest", session: "xdoctest" }
-          - { python: "3.11", os: "ubuntu-latest", session: "docs-build" }
+          - { python: "3.12", os: "windows-latest", session: "tests" }
+          - { python: "3.12", os: "macos-latest", session: "tests" }
+          - { python: "3.12", os: "ubuntu-latest", session: "typeguard" }
+          - { python: "3.12", os: "ubuntu-latest", session: "xdoctest" }
+          - { python: "3.12", os: "ubuntu-latest", session: "docs-build" }
 
     env:
       NOXSESSION: ${{ matrix.session }}

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,4 +1,5 @@
 """Sphinx configuration."""
+
 project = "Thymed"
 author = "Benjamin Crews"
 copyright = "2022, Benjamin Crews"

diff --git a/noxfile.py b/noxfile.py
@@ -1,4 +1,5 @@
 """Nox sessions."""
+
 import os
 import shlex
 import shutil
@@ -23,7 +24,7 @@
 
 
 package = "thymed"
-python_versions = ["3.11", "3.10", "3.9"]
+python_versions = ["3.12", "3.11", "3.10", "3.9"]
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
     "pre-commit",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "thymed"
-version = "0.4.1"
+version = "0.5.0"
 description = "Thymed"
 authors = ["Benjamin Crews <aceF22@gmail.com>"]
 license = "MIT"
@@ -16,11 +16,11 @@ classifiers = [
 Changelog = "https://github.com/czarified/thymed/releases"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = ">=3.9,<4.0"
 click = ">=8.0.1"
 toml = "^0.10.2"
 rich = ">12.5.1"
-pandas = "^1.5.0"
+pandas = ">2.2.0"
 openpyxl = "^3.0.10"
 textual = ">0.38.1"
 textual-plotext = "^0.2.1"

diff --git a/src/thymed/__init__.py b/src/thymed/__init__.py
@@ -4,7 +4,6 @@
 related to to time-keeping.
 """
 
-
 import datetime as dt
 import json
 from copy import copy

diff --git a/src/thymed/__main__.py b/src/thymed/__main__.py
@@ -1,9 +1,10 @@
 """Command-line interface."""
+
 import json
+from importlib.metadata import version
 from typing import Any
 
 import click
-import pkg_resources
 from rich.console import Console
 from rich.panel import Panel
 from rich.prompt import Confirm
@@ -19,7 +20,7 @@
 install()
 
 
-__version__ = pkg_resources.get_distribution("thymed").version
+__version__ = version("thymed")
 
 
 @click.group()

diff --git a/src/thymed/thymer.py b/src/thymed/thymer.py
@@ -3,6 +3,7 @@
 The Text User Interface is all created, managed,
 and tested with Textual.
 """
+
 import json
 from time import monotonic
 

diff --git a/tests/test_chargecode.py b/tests/test_chargecode.py
@@ -1,4 +1,5 @@
 """Test Cases for the ChargeCode class."""
+
 import datetime as dt
 import json
 import random

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -1,4 +1,5 @@
 """Test cases for the __main__ module."""
+
 import json
 
 import pytest

diff --git a/tests/test_timecard.py b/tests/test_timecard.py
@@ -1,4 +1,5 @@
 """Test Cases for the ChargeCode class."""
+
 import datetime as dt
 import json
 import random