Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.12"
- name: Install dependencies
run: |
curl -sSL https://install.python-poetry.org | python - --version 1.4.2
curl -sSL https://install.python-poetry.org | python - --version 1.8.5
poetry install

- name: Run tests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
Expand All @@ -27,7 +27,7 @@ jobs:

- name: Install dependencies
run: |
curl -sSL https://install.python-poetry.org | python - --version 1.4.2
curl -sSL https://install.python-poetry.org | python - --version 1.8.5
poetry install

- name: Run tests
Expand All @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 6 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@

# The full version, including alpha/beta/rc tags
# release = '0.1.0'
from pkg_resources import get_distribution, DistributionNotFound
# NB: alias the import — a bare `version` in this module's namespace would be
# picked up by Sphinx as the `version` config value (a function), crashing the
# inventory dump.
from importlib.metadata import version as _get_version, PackageNotFoundError
try:
release = get_distribution('kw6').version
except DistributionNotFound:
release = _get_version('kw6')
except PackageNotFoundError:
pass


Expand All @@ -39,7 +42,6 @@
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'recommonmark',
'sphinx.ext.viewcode',
'sphinx_rtd_theme',
]
Expand Down
41 changes: 6 additions & 35 deletions docs/source/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
alabaster==0.7.12
Babel==2.8.0
certifi==2020.6.20
chardet==3.0.4
commonmark==0.9.1
docutils==0.16
flake8==3.8.3
idna==2.10
imagesize==1.2.0
Jinja2==2.11.2
MarkupSafe==1.1.1
mccabe==0.6.1
numpy==1.19.2
packaging==20.4
Pillow==7.2.0
pycodestyle==2.6.0
pydantic==1.6.1
pyflakes==2.2.0
Pygments==2.7.1
pyparsing==2.4.7
pytz==2020.1
recommonmark==0.6.0
requests==2.24.0
six==1.15.0
snowballstemmer==2.0.0
Sphinx==3.2.1
sphinx-rtd-theme==0.5.0
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==1.0.3
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.4
tqdm==4.54.1
urllib3==1.25.10
# Install the package itself so autodoc can import kw6 and its dependencies
# (numpy, Pillow, pydantic) resolve to current wheels on the docs Python.
.

sphinx>=7,<9
sphinx-rtd-theme>=2
7 changes: 4 additions & 3 deletions kw6/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from kw6.reader import Reader

from pkg_resources import get_distribution, DistributionNotFound
from importlib.metadata import version, PackageNotFoundError

try:
__version__ = get_distribution("kw6").version
except DistributionNotFound:
__version__ = version("kw6")
except PackageNotFoundError:
pass
1,366 changes: 736 additions & 630 deletions poetry.lock

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ authors = ["NextML AB"]
license = "Apache 2.0"

[tool.poetry.dependencies]
python = ">=3.8,<3.11"
# Floor raised to 3.9 so numpy/Pillow resolve to lines that ship cp312 wheels
# (numpy 1.26 / Pillow 10 dropped 3.8); ceiling <3.13 for Python 3.12.
python = ">=3.9,<3.13"
numpy = "^1.21.2"
Pillow = "^9.0.0"
# Pillow >=10 is the first line with cp312 wheels; <12 keeps the 3.8 floor
# satisfiable (Pillow 11 dropped 3.8).
Pillow = ">=10.0,<12"
pydantic = "^2.0.0"

[tool.poetry.dev-dependencies]
Expand Down
Loading