diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4b2b3e6..8f89503 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3.8' - name: Deploy MkDocs env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7afde1a..b87a824 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install pre-commit hooks run: | pip install pre-commit @@ -30,10 +30,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install pyodi run: pip install .[dev] - name: Test with pytest diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b149f2e..39e8dae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,3 +27,4 @@ repos: rev: 19.10b0 hooks: - id: black + additional_dependencies: ['click==8.0.4'] diff --git a/pyproject.toml b/pyproject.toml index a9d63df..e687cca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools >= 40.9.0", "wheel"] +requires = ["setuptools >= 63.2.0", "wheel"] build-backend = "setuptools.build_meta" [tool.black] diff --git a/setup.cfg b/setup.cfg index c6fe274..3c89339 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,18 +9,18 @@ url = https://github.com/Gradiant/pyodi [options] packages = find_namespace: -python_requires = >=3.7 +python_requires = >=3.8 install_requires = - numpy==1.20.1 - loguru==0.5.3 - matplotlib==3.3.4 - numba>=0.52.0 - pandas==1.2.1 - pillow==8.1.0 - plotly==5.2.2 - pycocotools==2.0.2 + numpy==1.22.1 + loguru==0.6.0 + matplotlib==3.5.2 + numba>=0.56.0 + pandas==1.4.2 + pillow==9.2.0 + plotly==5.9.0 + pycocotools==2.0.4 kaleido==v0.2.1 - scikit-learn==0.24.1 + scikit-learn==1.1.1 fire==0.4.0 [options.packages.find] @@ -31,19 +31,20 @@ exclude = [options.extras_require] dev = - black==20.8b1 - flake8==3.8.4 - flake8-docstrings==1.5.0 - isort==5.7.0 - mkdocs==1.1.2 - mkdocstrings==0.14.0 - mkdocs-material==6.2.8 + black==22.6.0 + flake8==4.0.1 + flake8-docstrings==1.6.0 + isort==5.10.1 + mkdocs==1.3.1 + mkdocstrings==0.19.0 + mkdocs-material==8.3.9 + mkdocstrings-python==0.7.1 mock==4.0.3 - mypy==0.800 - pre-commit==2.10.1 - pydocstyle==5.1.1 - pymdown-extensions==8.1.1 - pytest==6.2.2 + mypy==0.960 + pre-commit==2.20.0 + pydocstyle==6.1.1 + pymdown-extensions==9.5 + pytest==7.1.2 [options.entry_points] console_scripts = diff --git a/tests/core/test_boxes.py b/tests/core/test_boxes.py index 2223809..54ee9bb 100644 --- a/tests/core/test_boxes.py +++ b/tests/core/test_boxes.py @@ -49,7 +49,7 @@ def test_get_area_and_ratio(get_simple_annotations_with_img_sizes): df_annotations = get_simple_annotations_with_img_sizes() df_annotations = get_scale_and_ratio(df_annotations) expected_scales = np.sqrt([100, 2000]) - expected_ratios = np.array([1, 0.8], dtype=np.float) + expected_ratios = np.array([1, 0.8], dtype=float) np.testing.assert_equal(df_annotations["scale"].to_numpy(), expected_scales) np.testing.assert_equal(df_annotations["ratio"].to_numpy(), expected_ratios)