Skip to content

Commit

Permalink
Mark python 3.6 unsupported (#617)
Browse files Browse the repository at this point in the history
* Mark python 3.6 unsupported in setup.py

* Update changelog

* Drop py3.6 from CI

* Update docs

* Update python code
  • Loading branch information
Maxim Zhiltsov authored Jan 11, 2022
1 parent 46bbbbf commit 86cf763
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/health_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
python-version: ['3.7', '3.8', '3.9']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -24,6 +24,6 @@ jobs:
pytest -v --cov --cov-report xml:coverage.xml
datum -h
- name: Sending coverage results
if: matrix.python-version == '3.6'
if: matrix.python-version == '3.7'
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r coverage.xml -t ${{ secrets.CODACY_PROJECT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/pr_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: ['macos-10.15', 'ubuntu-20.04', 'windows-2016']
python-version: ['3.6', '3.7', '3.8', '3.9']
python-version: ['3.7', '3.8', '3.9']
name: build and test (${{ matrix.os }}, Python ${{ matrix.python-version }})
runs-on: ${{ matrix.os }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- TBD

### Removed
- TBD
- Official support of Python 3.6 (due to it's EOL)
(<https://github.com/openvinotoolkit/datumaro/pull/617>)

### Fixed
- Fails in multimerge when lines are not approximated and when there are no
Expand Down
8 changes: 1 addition & 7 deletions datumaro/util/attrs_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@ def validator(inst, attribute, value):
value = default
else:
dst_type = None
if attribute.type and inspect.isclass(attribute.type) and \
not hasattr(attribute.type, '__origin__'):
# ^^^^^^^
# Disallow Generics in python 3.6
# Can be dropped with 3.6 support. Generics canot be used
# in isinstance() checks.

if attribute.type and inspect.isclass(attribute.type):
dst_type = attribute.type
elif conv and inspect.isclass(conv):
dst_type = conv
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def parse_requirements(filename=CORE_REQUIREMENTS_FILE):
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
python_requires='>=3.6',
python_requires='>=3.7',
install_requires=CORE_REQUIREMENTS,
extras_require={
'tf': ['tensorflow'],
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ weight: 50

### Prerequisites

- Python (3.6+)
- Python (3.7+)

``` bash
git clone https://github.com/openvinotoolkit/datumaro
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ To read about the design concept and features of Datumaro, go to the [design sec

### Dependencies

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

Optionally, create a virtual environment:
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/user-manual/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ weight: 1

### Dependencies

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

### Installation steps
Expand Down

0 comments on commit 86cf763

Please sign in to comment.