Skip to content

Commit

Permalink
Update for release 1.4.0rc1 (#1084)
Browse files Browse the repository at this point in the history
* dropping support for python 3.7
* updated version string
  • Loading branch information
yunchu committed Jul 7, 2023
1 parent 6a1bc5a commit 78462aa
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/health_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
fail-fast: false
matrix:
include:
- python-version: "3.7"
tox-env-py: "37"
- python-version: "3.8"
tox-env-py: "38"
- python-version: "3.9"
tox-env-py: "39"
- python-version: "3.10"
tox-env-py: "310"
- python-version: "3.11"
tox-env-py: "311"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@ jobs:
fail-fast: false
matrix:
os: ['macos-11', 'ubuntu-20.04', 'windows-2019']
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10','3.11']
include:
- os: "macos-11"
tox-env-os: "darwin"
- os: "ubuntu-20.04"
tox-env-os: "lin"
- os: "windows-2019"
tox-env-os: "win"
- python-version: "3.7"
tox-env-py: "37"
- python-version: "3.8"
tox-env-py: "38"
- python-version: "3.9"
tox-env-py: "39"
- python-version: "3.10"
tox-env-py: "310"
- python-version: "3.11"
tox-env-py: "311"
name: nightly regression test (${{ matrix.os }}, Python ${{ matrix.python-version }})
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Installing python
uses: actions/setup-python@v4
with:
python-version: ${{ (matrix.os == 'macos-11' && matrix.python-version == '3.7') && '3.7.16' || matrix.python-version }}
python-version: ${{ matrix.python-version }}
cache: pip
- name: Installing dependencies
run: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## \[Unreleased\]
### New features
- Changed supported Python version range (>=3.8, <=3.11)
(<https://github.com/openvinotoolkit/datumaro/pull/1083>)
- Migrate OpenVINO v2023.0.0
(<https://github.com/openvinotoolkit/datumaro/pull/1036>)
- Add Roboflow data format support (COCO JSON, Pascal VOC XML, YOLOv5-PyTorch, YOLOv7-PyTorch, YOLOv8, YOLOv5 Oriented Bounding Boxes, Multiclass CSV, TFRecord, CreateML JSON)
Expand Down
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

### Prerequisites

- Python (3.7+)
- Python (3.8+)

``` bash
git clone https://github.com/openvinotoolkit/datumaro
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Installation
Dependencies
------------

- Python (3.7+)
- Python (3.8+)
- Optional: OpenVINO, TensorFlow, PyTorch, MxNet, Caffe, Accuracy Checker, Git

Installation steps
Expand Down
12 changes: 3 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ omit = [
]

[tool.cibuildwheel]
build = "cp37-*_x86_64 cp38-*_x86_64 cp39-*_x86_64 cp310-*_x86_64 cp37-*_amd64 cp38-*_amd64 cp39-*_amd64 cp310-*_amd64"
build = "cp38-*_x86_64 cp39-*_x86_64 cp310-*_x86_64 cp311-*_x86_64 cp38-*_amd64 cp39-*_amd64 cp310-*_amd64 cp311-*_amd64"

[tool.coverage.report]
# Regexes for lines to exclude from consideration
Expand All @@ -43,20 +43,14 @@ exclude_lines = [
'if __name__ == .__main__.:',
]

[tool.pytest.ini_options]
markers = [
"v1_3_0: marks tests for release 1.3.0",
"v1_4_0: marks tests for release 1.4.0",
]

# don't fail on the code that can be found
ignore_errors = true

skip_empty = true

[tool.black]
line-length = 100
target-version = ['py37']
target-version = ['py38']

[tool.ruff]
# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
Expand Down Expand Up @@ -111,7 +105,7 @@ line-length = 120
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

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

# ignore-init-module-imports = true

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def parse_requirements(filename=CORE_REQUIREMENTS_FILE):
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=CORE_REQUIREMENTS,
extras_require={
"tf": ["tensorflow"],
Expand Down
2 changes: 1 addition & 1 deletion src/datumaro/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.3.2"
__version__ = "1.4.0rc1"
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ commands =
rm {toxworkdir}/requirements.txt


[testenv:tests-py{37,38,39,310}-{darwin,lin,win}]
[testenv:tests-py{38,39,310,311}-{darwin,lin,win}]
commands =
python -m pytest -v --junitxml={toxworkdir}/results-{envname}.xml {posargs:tests}

Expand Down

0 comments on commit 78462aa

Please sign in to comment.