From 4e5ac47195183ed9babce7155bb455c4710fad61 Mon Sep 17 00:00:00 2001 From: Arne Binder Date: Wed, 17 Apr 2024 18:50:33 +0200 Subject: [PATCH 1/3] release 0.10.0 --- dataset_builders/pie/aae2/requirements.txt | 2 +- dataset_builders/pie/abstrct/requirements.txt | 2 +- dataset_builders/pie/argmicro/requirements.txt | 2 +- dataset_builders/pie/brat/requirements.txt | 2 +- dataset_builders/pie/cdcp/requirements.txt | 2 +- dataset_builders/pie/conll2003/requirements.txt | 2 +- dataset_builders/pie/drugprot/requirements.txt | 2 +- dataset_builders/pie/imdb/requirements.txt | 2 +- dataset_builders/pie/sciarg/requirements.txt | 2 +- dataset_builders/pie/scidtb_argmin/requirements.txt | 2 +- dataset_builders/pie/scientific_papers/requirements.txt | 2 +- dataset_builders/pie/squad_v2/requirements.txt | 2 +- dataset_builders/pie/tacred/requirements.txt | 2 +- pyproject.toml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dataset_builders/pie/aae2/requirements.txt b/dataset_builders/pie/aae2/requirements.txt index 78d2591c..3cb91dea 100644 --- a/dataset_builders/pie/aae2/requirements.txt +++ b/dataset_builders/pie/aae2/requirements.txt @@ -1,2 +1,2 @@ -pie-datasets>=0.8.0,<0.10.0 +pie-datasets>=0.8.0,<0.11.0 pie-modules>=0.8.3,<0.12.0 diff --git a/dataset_builders/pie/abstrct/requirements.txt b/dataset_builders/pie/abstrct/requirements.txt index 1d30e0d6..198211f5 100644 --- a/dataset_builders/pie/abstrct/requirements.txt +++ b/dataset_builders/pie/abstrct/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.4.0,<0.10.0 +pie-datasets>=0.4.0,<0.11.0 diff --git a/dataset_builders/pie/argmicro/requirements.txt b/dataset_builders/pie/argmicro/requirements.txt index a6f90a9d..6aaa1e0f 100644 --- a/dataset_builders/pie/argmicro/requirements.txt +++ b/dataset_builders/pie/argmicro/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.3.3,<0.10.0 +pie-datasets>=0.3.3,<0.11.0 diff --git a/dataset_builders/pie/brat/requirements.txt b/dataset_builders/pie/brat/requirements.txt index 1d30e0d6..198211f5 100644 --- a/dataset_builders/pie/brat/requirements.txt +++ b/dataset_builders/pie/brat/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.4.0,<0.10.0 +pie-datasets>=0.4.0,<0.11.0 diff --git a/dataset_builders/pie/cdcp/requirements.txt b/dataset_builders/pie/cdcp/requirements.txt index 95818bbf..293dbaaf 100644 --- a/dataset_builders/pie/cdcp/requirements.txt +++ b/dataset_builders/pie/cdcp/requirements.txt @@ -1,2 +1,2 @@ -pie-datasets>=0.6.0,<0.10.0 +pie-datasets>=0.6.0,<0.11.0 pie-modules>=0.8.0,<0.12.0 diff --git a/dataset_builders/pie/conll2003/requirements.txt b/dataset_builders/pie/conll2003/requirements.txt index a5a02550..d7883842 100644 --- a/dataset_builders/pie/conll2003/requirements.txt +++ b/dataset_builders/pie/conll2003/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.8.1,<0.10.0 +pie-datasets>=0.8.1,<0.11.0 diff --git a/dataset_builders/pie/drugprot/requirements.txt b/dataset_builders/pie/drugprot/requirements.txt index 2761ca6d..6fe4a9be 100644 --- a/dataset_builders/pie/drugprot/requirements.txt +++ b/dataset_builders/pie/drugprot/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.9.0,<0.10.0 +pie-datasets>=0.9.0,<0.11.0 diff --git a/dataset_builders/pie/imdb/requirements.txt b/dataset_builders/pie/imdb/requirements.txt index a5a02550..d7883842 100644 --- a/dataset_builders/pie/imdb/requirements.txt +++ b/dataset_builders/pie/imdb/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.8.1,<0.10.0 +pie-datasets>=0.8.1,<0.11.0 diff --git a/dataset_builders/pie/sciarg/requirements.txt b/dataset_builders/pie/sciarg/requirements.txt index d8e87a83..573849bd 100644 --- a/dataset_builders/pie/sciarg/requirements.txt +++ b/dataset_builders/pie/sciarg/requirements.txt @@ -1,3 +1,3 @@ -pie-datasets>=0.6.0,<0.10.0 +pie-datasets>=0.6.0,<0.11.0 pie-modules>=0.10.8,<0.12.0 networkx>=3.0.0,<4.0.0 diff --git a/dataset_builders/pie/scidtb_argmin/requirements.txt b/dataset_builders/pie/scidtb_argmin/requirements.txt index 95818bbf..293dbaaf 100644 --- a/dataset_builders/pie/scidtb_argmin/requirements.txt +++ b/dataset_builders/pie/scidtb_argmin/requirements.txt @@ -1,2 +1,2 @@ -pie-datasets>=0.6.0,<0.10.0 +pie-datasets>=0.6.0,<0.11.0 pie-modules>=0.8.0,<0.12.0 diff --git a/dataset_builders/pie/scientific_papers/requirements.txt b/dataset_builders/pie/scientific_papers/requirements.txt index 8b8152d0..536a6549 100644 --- a/dataset_builders/pie/scientific_papers/requirements.txt +++ b/dataset_builders/pie/scientific_papers/requirements.txt @@ -1 +1 @@ -pie-datasets>=0.8.0,<0.10.0 +pie-datasets>=0.8.0,<0.11.0 diff --git a/dataset_builders/pie/squad_v2/requirements.txt b/dataset_builders/pie/squad_v2/requirements.txt index 5adfd9ee..b9589f1b 100644 --- a/dataset_builders/pie/squad_v2/requirements.txt +++ b/dataset_builders/pie/squad_v2/requirements.txt @@ -1,2 +1,2 @@ -pie-datasets>=0.8.1,<0.10.0 +pie-datasets>=0.8.1,<0.11.0 pie-modules>=0.8.2,<0.12.0 diff --git a/dataset_builders/pie/tacred/requirements.txt b/dataset_builders/pie/tacred/requirements.txt index 95818bbf..293dbaaf 100644 --- a/dataset_builders/pie/tacred/requirements.txt +++ b/dataset_builders/pie/tacred/requirements.txt @@ -1,2 +1,2 @@ -pie-datasets>=0.6.0,<0.10.0 +pie-datasets>=0.6.0,<0.11.0 pie-modules>=0.8.0,<0.12.0 diff --git a/pyproject.toml b/pyproject.toml index b7876334..16141c44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pie-datasets" -version = "0.9.0" +version = "0.10.0" description = "Building scripts for PyTorch-IE Datasets" authors = ["Arne Binder "] readme = "README.md" From 28631eae5e6eb198771bb2ebe5029275b6f5b548 Mon Sep 17 00:00:00 2001 From: Arne Binder Date: Wed, 17 Apr 2024 18:58:05 +0200 Subject: [PATCH 2/3] use annotation types from pytorch-ie --- tests/dataset_builders/common.py | 5 ++--- tests/dataset_builders/pie/test_brat.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/dataset_builders/common.py b/tests/dataset_builders/common.py index d4b5aa0d..758e4f9b 100644 --- a/tests/dataset_builders/common.py +++ b/tests/dataset_builders/common.py @@ -6,9 +6,8 @@ from pathlib import Path from typing import Any, List, Optional, Sequence -from pie_modules.annotations import BinaryRelation, LabeledMultiSpan, LabeledSpan, Span -from pytorch_ie import Annotation -from pytorch_ie.core import AnnotationList, annotation_field +from pytorch_ie.annotations import BinaryRelation, LabeledMultiSpan, LabeledSpan, Span +from pytorch_ie.core import Annotation, AnnotationList, annotation_field from pytorch_ie.documents import TokenBasedDocument from pie_datasets.builders.brat import BratAttribute diff --git a/tests/dataset_builders/pie/test_brat.py b/tests/dataset_builders/pie/test_brat.py index 034e19bc..dcb9225e 100644 --- a/tests/dataset_builders/pie/test_brat.py +++ b/tests/dataset_builders/pie/test_brat.py @@ -2,7 +2,7 @@ import datasets import pytest -from pie_modules.annotations import BinaryRelation, LabeledMultiSpan, LabeledSpan +from pytorch_ie.annotations import BinaryRelation, LabeledMultiSpan, LabeledSpan from pytorch_ie.core import Annotation from pytorch_ie.documents import TextBasedDocument From 25227210260f6ce95478b06186e1a8a6a6d0aba0 Mon Sep 17 00:00:00 2001 From: Arne Binder Date: Wed, 17 Apr 2024 19:14:39 +0200 Subject: [PATCH 3/3] fix dev dependency --- poetry.lock | 12 ++++++------ pyproject.toml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poetry.lock b/poetry.lock index 49b46faf..eda9c9f8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1029,19 +1029,19 @@ xml = ["lxml (>=4.8.0)"] [[package]] name = "pie-modules" -version = "0.10.8" +version = "0.11.1" description = "Model and Taskmodule implementations for PyTorch-IE" optional = false -python-versions = ">=3.9,<4.0" +python-versions = "<4.0,>=3.9" files = [ - {file = "pie_modules-0.10.8-py3-none-any.whl", hash = "sha256:ccf85d000598dd03a06e44a330d2ee5a822b772148d8d082e02d2b3cd9504693"}, - {file = "pie_modules-0.10.8.tar.gz", hash = "sha256:07f725a4ed455034677388b5ed24b2ddc500c44334e7071a9ee6c2a35b7f4efc"}, + {file = "pie_modules-0.11.1-py3-none-any.whl", hash = "sha256:32652e43983c4ccc224ff94b782046e9f524029f0a0666b3aec292fee220bf49"}, + {file = "pie_modules-0.11.1.tar.gz", hash = "sha256:533ae6f48f3cddf5bf4f65eaa727a56e7bf45df3e4d46fc37e428e9bf753f188"}, ] [package.dependencies] networkx = ">=3.0.0,<4.0.0" pytorch-crf = ">=0.7.2" -pytorch-ie = ">=0.29.8,<0.31.0" +pytorch-ie = ">=0.30.3,<0.31.0" pytorch-lightning = ">=2.1.0,<3.0.0" torchmetrics = ">=1,<2" transformers = ">=4.35.0,<5.0.0" @@ -2165,4 +2165,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "b08950259b0c8dc04a2a975f39c4a835b4fb3f327afced1e3bc6a152a4966a18" +content-hash = "c65065344069c68a19cebe9ad18e24d400ddf5b329c076694b0c99c684492af4" diff --git a/pyproject.toml b/pyproject.toml index 16141c44..26e89c9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,8 +31,8 @@ datasets = ">=2.14.0,<2.16.0" pyarrow = "^13" [tool.poetry.group.dev.dependencies] -pytorch-ie = {version = ">=0.30.2,<0.31.0", optional = true} -pie-modules = ">=0.10.8,<0.12.0" +pytorch-ie = {version = ">=0.30.3,<0.31.0", optional = true} +pie-modules = ">=0.11.1,<0.12.0" torch = {version = "^2.1.0+cpu", source = "pytorch"} pytest = "^7.4.2" pytest-cov = "^4.1.0"