From a7accd69be7eeda469b44d031290dcae8ef60446 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Fri, 15 Nov 2024 14:31:47 +0100 Subject: [PATCH 1/2] Bump minimum version of python to 3.9 --- .github/workflows/tests.yml | 6 +++--- pyproject.toml | 2 +- setup.cfg | 4 +--- src/pystow/cache.py | 5 ----- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3009a2..4ff11e1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.12", "3.8" ] + python-version: [ "3.12", "3.9" ] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.12", "3.8" ] + python-version: [ "3.12", "3.9" ] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -55,7 +55,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] - python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index 8f9416f..11a8e62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta:__legacy__" [tool.black] line-length = 100 -target-version = ["py38", "py39", "py310", "py311", "py312"] +target-version = ["py39", "py310", "py311", "py312"] [tool.isort] profile = "black" diff --git a/setup.cfg b/setup.cfg index e46c1a2..c3dc526 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,6 @@ classifiers = License :: OSI Approved :: MIT License Operating System :: OS Independent Programming Language :: Python - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 @@ -44,13 +43,12 @@ keywords = [options] install_requires = - pickle5; python_version < "3.8" click requests tqdm zip_safe = false -python_requires = >=3.7 +python_requires = >=3.9 # Where is my code packages = find: diff --git a/src/pystow/cache.py b/src/pystow/cache.py index ed33e71..d35c7e8 100644 --- a/src/pystow/cache.py +++ b/src/pystow/cache.py @@ -21,11 +21,6 @@ cast, ) -try: - import pickle5 as pickle -except ImportError: - import pickle - if TYPE_CHECKING: import pandas as pd From 288d9b392961c990aab5c5e38e7d260984aabcd9 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Fri, 15 Nov 2024 14:32:07 +0100 Subject: [PATCH 2/2] Update cache.py --- src/pystow/cache.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pystow/cache.py b/src/pystow/cache.py index d35c7e8..845c847 100644 --- a/src/pystow/cache.py +++ b/src/pystow/cache.py @@ -5,6 +5,7 @@ import functools import json import logging +import pickle from abc import ABC, abstractmethod from pathlib import Path from typing import (