diff --git a/.github/workflows/gate.yml b/.github/workflows/gate.yml index fc3c5b0..5e885ff 100644 --- a/.github/workflows/gate.yml +++ b/.github/workflows/gate.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.11"] + python-version: ["3.9", "3.13"] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v4 @@ -23,7 +23,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: install run: | - pip3 install 'poetry<2.0.0' + pip3 install poetry poetry install --no-root - name: test run: | diff --git a/README.md b/README.md index 67d7f6b..355e655 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,9 @@ What the code in this repo actually does! ### prerequisites +> [!NOTE] +> Poetry 2 [introduced breaking changes](https://github.com/python-poetry/poetry/issues/9136) that are not backwards compatible with Poetry 1. The pyproject.toml is compatible with Poetry 2 only - this is installed by default using the below instructions, but if you are using an already-installed copy of Poetry you should make sure to upgrade it to version 2. + - Install poetry https://python-poetry.org/docs/#installation - Run the following command to set up the dependencies diff --git a/pyproject.toml b/pyproject.toml index efe1890..fef6e40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,20 +1,13 @@ [project] name = "sheet-to-triples" -license = {file="COPYING", name="GPL-3.0-or-later"} +license = "GPL-3.0-or-later" +license-files = ["COPYING"] version = "0.1.0" authors = [{"name"="Martin Packman", "email"="martin.packman@visual-meaning.com"}] description = "Convert tabular data into triples." -# Poetry have their own build metadata block and can't use the one in [project] -# TODO: Replace poetry with a dependency management tool that can. -[tool.poetry] -name = "sheet-to-triples" -version = "0.1.0" -authors = ["Martin Packman "] -description = "Convert tabular data into triples." - [tool.poetry.dependencies] -python = "^3.8.10" +python = "^3.9.13" pycountry = "^22" # openpyxl broke parsing some workbooks with filters and the maintainer made # the classic mistake of blocking the regression fix on a rethink of how @@ -26,10 +19,10 @@ openpyxl = "=3.0.10" rdflib = {version = "^7", extras = ["sparql"]} xlrd = "^2" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] ruff = "^0.0.292" coverage = "^7" -pyfakefs = "^5" +pyfakefs = "^5.7.0" [tool.ruff] select = ["C9", "E", "F", "W"]