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
Changes from 1 commit
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
Prev Previous commit
Next Next commit
update for release 1.6.1rc1
  • Loading branch information
yunchu committed Apr 15, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit cdae1607fd47e2ce7238cbc787d21d4fe853cf33
8 changes: 0 additions & 8 deletions .github/workflows/pre_merge.yml
Original file line number Diff line number Diff line change
@@ -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:
@@ -70,12 +68,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Installing Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- name: Install Python
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
8 changes: 1 addition & 7 deletions .github/workflows/run_tests_in_tox.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ on:
type: string
default: "3.10"
toxenv-pyver:
description: "[py38, py39, py310, py311]"
description: "[py39, py310]"
type: string
default: "py310"
toxenv-task:
@@ -46,12 +46,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Installing Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- name: Set up Python
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_in_tox_custom.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ on:
type: string
default: "3.10"
toxenv-pyver:
description: "[py38, py39, py310, py311]"
description: "[py39, py310]"
type: string
default: "py310"
toxenv-task:
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"


# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -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"

4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
natsort==8.1.*
prettytable==3.9.*
pyyaml
# datumaro==1.6.0
datumaro @ git+https://github.com/openvinotoolkit/datumaro@766303a730446b77768c86662fb8ac67b37068c4
# datumaro==1.6.1rc2
datumaro @ git+https://github.com/openvinotoolkit/datumaro@50b4212c3c7f1e7de035f79502b5b2eb972d251f
psutil==5.9.*
scipy==1.10.*
bayesian-optimization==1.4.*
13 changes: 4 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
@@ -50,7 +45,7 @@ extras =
seg: segmentation
visprompt: visual_prompting

[testenv:pre-commit-all-{py38,py39,py310,py311}-{pt1,pt2}]
[testenv:pre-commit-all-{py39,py310}-{pt1,pt2}]
deps =
{[testenv]deps}
-r{toxinidir}/requirements/dev.txt
@@ -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,py311}-{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
@@ -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,py311}-{pt1,pt2}]
[testenv:unittest-all-{py39,py310}-{pt1,pt2}]
deps =
{[testenv]deps}
-r{toxinidir}/requirements/dev.txt
@@ -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
Loading