Skip to content

Commit

Permalink
Merge pull request #308 from mdekstrand/tweak/drop37
Browse files Browse the repository at this point in the history
Remove support for Python 3.7 and NumPy <1.19
  • Loading branch information
mdekstrand committed Feb 19, 2022
2 parents 9e471a6 + d137356 commit f592194
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 22 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
matrix:
python:
- "3.8"
- "3.7"
- "3.9"
- "3.10"
platform:
Expand Down Expand Up @@ -173,7 +172,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -232,11 +230,12 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'
architecture: x64

- name: Set up Python deps
run: |
set -e
python -m pip install -U pip
python -m pip install -c min-constraints.txt .[test]
python -m pip install pytest-cov
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2018–2021 Boise State University
Copyright (c) 2018–2022 Boise State University

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion lenskit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from lenskit.algorithms import * # noqa: F401,F403

__version__ = '0.14.0'
__version__ = '0.15.0'


class DataWarning(UserWarning):
Expand Down
12 changes: 2 additions & 10 deletions lenskit/sharing/shm.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,8 @@
import pickle
from . import sharing_mode, PersistedModel

try:
import multiprocessing.shared_memory as shm
SHM_AVAILABLE = sys.platform != 'win32'
except ImportError:
SHM_AVAILABLE = False

if pickle.HIGHEST_PROTOCOL < 5:
import pickle5 as pickle
import multiprocessing.shared_memory as shm
SHM_AVAILABLE = sys.platform != 'win32'

_log = logging.getLogger(__name__)

Expand All @@ -26,8 +20,6 @@ def persist_shm(model, dir=None):
Returns:
PersistedModel: The persisted object.
"""
if shm is None:
raise ImportError('multiprocessing.shared_memory')

buffers = []

Expand Down
3 changes: 0 additions & 3 deletions lenskit/util/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
from lenskit.util.log import log_queue
from lenskit.util.random import derive_seed, init_rng, get_root_seed

if pickle.HIGHEST_PROTOCOL < 5:
import pickle5 as pickle

_log = logging.getLogger(__name__)
__work_model = None
__work_func = None
Expand Down
2 changes: 1 addition & 1 deletion min-constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pandas==1.0.0
numpy==1.17.0
numpy==1.19.0
scipy==1.2.1
numba==0.51.0
pyarrow==0.15.1
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ authors = [
classifiers = [
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand All @@ -19,11 +18,11 @@ classifiers = [
]
readme = "README.md"
license = { file = "LICENSE.md" }
requires-python = ">= 3.7"
requires-python = ">= 3.8"
dynamic = ['version', 'description']
dependencies = [
"pandas >=1.0, ==1.*",
"numpy >= 1.17",
"numpy >= 1.19",
"scipy >= 1.2",
"numba >= 0.51, < 0.56",
"cffi >= 1.12.2",
Expand Down

0 comments on commit f592194

Please sign in to comment.