Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump datumaro 1.6.1rc2 #3322

Merged
merged 7 commits into from
Apr 16, 2024
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
6 changes: 2 additions & 4 deletions .github/workflows/pre_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ jobs:
include:
- python-version: "3.9"
tox-env: "py39"
- python-version: "3.10"
tox-env: "py310"
name: Unit-Test-with-Python${{ matrix.python-version }}
# This is what will cancel the job concurrency
concurrency:
Expand All @@ -73,15 +71,15 @@ jobs:
- name: Install Python
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
pip install --require-hashes --no-deps -r requirements/gh-actions.txt
pip-compile --generate-hashes -o /tmp/otx-dev-requirements.txt requirements/dev.txt
pip install --require-hashes --no-deps -r /tmp/otx-dev-requirements.txt
rm /tmp/otx-dev-requirements.txt
- name: Run unit test
run: tox -vv -e unittest-all-py38-pt1
run: tox -vv -e unittest-all-py310-pt1
- name: Upload coverage artifact
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_in_tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
type: string
default: "3.10"
toxenv-pyver:
description: "[py38, py39, py310]"
description: "[py39, py310]"
type: string
default: "py310"
toxenv-task:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_in_tox_custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
type: string
default: "3.10"
toxenv-pyver:
description: "[py38, py39, py310]"
description: "[py39, py310]"
type: string
default: "py310"
toxenv-task:
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build-backend = "setuptools.build_meta"
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# CIBUILDWHEEL CONFIGURATION. #
[tool.cibuildwheel]
build = "cp38-manylinux_x86_64 cp39-manylinux_x86_64 cp310-manylinux_x86_64"
build = "cp39-manylinux_x86_64 cp310-manylinux_x86_64"


# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down Expand Up @@ -117,7 +117,7 @@ line-length = 120
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

# minimum target version
target-version = "py38"
target-version = "py39"

format = "grouped"

Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
natsort==8.1.*
prettytable==3.9.*
pyyaml
datumaro==1.6.0rc1
datumaro==1.6.1rc2
psutil==5.9.*
scipy==1.10.*
bayesian-optimization==1.4.*
Expand Down
13 changes: 4 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,13 @@ test_dir =
act: cli/action
visprompt: cli/visual_prompting
deps =
py38-pt1: torch @ https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl
py38-pt1: torchvision @ https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl
{all,act,cls,det,seg,iseg,iseg_t}-py38-pt1: mmcv-full @ https://download.openmmlab.com/mmcv/dist/cu117/torch1.13.0/mmcv_full-1.7.0-cp38-cp38-manylinux1_x86_64.whl
py39-pt1: torch @ https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl
py39-pt1: torchvision @ https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl
{all,act,cls,det,seg,iseg,iseg_t}-py39-pt1: mmcv-full @ https://download.openmmlab.com/mmcv/dist/cu117/torch1.13.0/mmcv_full-1.7.0-cp39-cp39-manylinux1_x86_64.whl
py310-pt1: torch @ https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl
py310-pt1: torchvision @ https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl
{all,act,cls,det,seg,iseg,iseg_t}-py310-pt1: mmcv-full @ https://download.openmmlab.com/mmcv/dist/cu117/torch1.13.0/mmcv_full-1.7.0-cp310-cp310-manylinux1_x86_64.whl

py38-pt2: torch @ https://download.pytorch.org/whl/cu117/torch-2.0.1%2Bcu117-cp38-cp38-linux_x86_64.whl
py38-pt2: torchvision @ https://download.pytorch.org/whl/cu117/torchvision-0.15.2%2Bcu117-cp38-cp38-linux_x86_64.whl
py39-pt2: torch @ https://download.pytorch.org/whl/cu117/torch-2.0.1%2Bcu117-cp39-cp39-linux_x86_64.whl
py39-pt2: torchvision @ https://download.pytorch.org/whl/cu117/torchvision-0.15.2%2Bcu117-cp39-cp39-linux_x86_64.whl
py310-pt2: torch @ https://download.pytorch.org/whl/cu117/torch-2.0.1%2Bcu117-cp310-cp310-linux_x86_64.whl
Expand All @@ -50,7 +45,7 @@ extras =
seg: segmentation
visprompt: visual_prompting

[testenv:pre-commit-all-{py38,py39,py310}-{pt1,pt2}]
[testenv:pre-commit-all-{py39,py310}-{pt1,pt2}]
deps =
{[testenv]deps}
-r{toxinidir}/requirements/dev.txt
Expand All @@ -59,7 +54,7 @@ commands =
pre-commit run --all-files


[testenv:tests-{all,ano,cls,det,iseg,iseg_t,seg,act,visprompt}-{py38,py39,py310}-{pt1,pt2}]
[testenv:tests-{all,ano,cls,det,iseg,iseg_t,seg,act,visprompt}-{py39,py310}-{pt1,pt2}]
deps =
{[testenv]deps}
-r{toxinidir}/requirements/dev.txt
Expand All @@ -69,7 +64,7 @@ commands =
python -m pytest -ra --showlocals --csv={toxworkdir}/{envname}.csv {posargs:tests/integration/{[testenv]test_dir}}


[testenv:unittest-all-{py38,py39,py310}-{pt1,pt2}]
[testenv:unittest-all-{py39,py310}-{pt1,pt2}]
deps =
{[testenv]deps}
-r{toxinidir}/requirements/dev.txt
Expand Down Expand Up @@ -122,7 +117,7 @@ commands =
make html


[testenv:package-py{38,39,310}-{pt1,pt2}]
[testenv:package-py{39,310}-{pt1,pt2}]
deps =
{[testenv]deps}
build==0.10.0
Expand Down
Loading