From 759c6970b7c753612f3c3ab92c4603b55009c1dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 14:46:41 -0600 Subject: [PATCH 1/5] deps: bump the major-dependencies group with 6 updates Updates the requirements on [arcgis](https://developers.arcgis.com/python/), [pg8000](https://github.com/tlocke/pg8000), [pytest-cov](https://github.com/pytest-dev/pytest-cov), [pytest-mock](https://github.com/pytest-dev/pytest-mock), [pytest](https://github.com/pytest-dev/pytest) and [black](https://github.com/psf/black) to permit the latest version. Updates `arcgis` to 2.0.0 Updates `pg8000` to 1.31.1 - [Commits](https://github.com/tlocke/pg8000/compare/1.29.0...1.31.1) Updates `pytest-cov` to 5.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v3.0.0...v5.0.0) Updates `pytest-mock` to 3.14.0 - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/v3.10.0...v3.14.0) Updates `pytest` to 8.1.1 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.0.0...8.1.1) Updates `black` to 24.3.0 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.3.0...24.3.0) --- updated-dependencies: - dependency-name: arcgis dependency-type: direct:production dependency-group: major-dependencies - dependency-name: pg8000 dependency-type: direct:production dependency-group: major-dependencies - dependency-name: pytest-cov dependency-type: direct:development dependency-group: major-dependencies - dependency-name: pytest-mock dependency-type: direct:development dependency-group: major-dependencies - dependency-name: pytest dependency-type: direct:development dependency-group: major-dependencies - dependency-name: black dependency-type: direct:development dependency-group: major-dependencies ... Signed-off-by: dependabot[bot] --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index ff14c4f..3be8459 100644 --- a/setup.py +++ b/setup.py @@ -37,9 +37,9 @@ }, keywords=["gis"], install_requires=[ - "arcgis==2.2.*", + "arcgis>=2.2,<2.1", "geopandas==0.14.*", - "pg8000>=1.29,<1.31", + "pg8000>=1.29,<1.32", "psycopg2-binary==2.9.*", "pygsheets==2.0.*", "pyogrio>=0.6,<0.8", @@ -49,13 +49,13 @@ extras_require={ "tests": [ "pdoc3==0.10.*", - "pytest-cov>=3,<5", + "pytest-cov>=3,<6", "pytest-instafail~=0.4", - "pytest-mock>=3.10,<3.13", + "pytest-mock>=3.10,<3.15", "pytest-ruff==0.*", "pytest-watch~=4.2", - "pytest>=6,<8", - "black>=23.3,<23.12", + "pytest>=6,<9", + "black>=23.3,<24.4", "requests-mock==1.*", "ruff==0.0.*", ] From f7a4c1b1cbfccee1d16f0a5efc36b3b28c89f838 Mon Sep 17 00:00:00 2001 From: Jake Adams Date: Mon, 1 Apr 2024 14:46:41 -0600 Subject: [PATCH 2/5] fix: dependabot is drunk? --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3be8459..173c0bf 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ }, keywords=["gis"], install_requires=[ - "arcgis>=2.2,<2.1", + "arcgis>=2.2,<2.3", "geopandas==0.14.*", "pg8000>=1.29,<1.32", "psycopg2-binary==2.9.*", From a5bf78abc8074c67c65f440dbbc65b397762f335 Mon Sep 17 00:00:00 2001 From: Jake Adams Date: Mon, 1 Apr 2024 14:47:04 -0600 Subject: [PATCH 3/5] ci: bump python to 3.11 --- .github/workflows/push.yml | 44 +++++++++++++++++------------------ .github/workflows/release.yml | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e240cb4..2b9d58e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,28 +8,28 @@ jobs: runs-on: ubuntu-latest steps: - - name: โฌ‡๏ธ Set up code - uses: actions/checkout@v4 - with: - show-progress: false - - - name: ๐Ÿ Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3.9 - cache: pip - cache-dependency-path: setup.py - - - name: ๐Ÿ“ฅ Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y libkrb5-dev - - - name: ๐Ÿ— Install module - run: pip install .[tests] - - - name: ๐Ÿงช Run pytest - run: pytest + - name: โฌ‡๏ธ Set up code + uses: actions/checkout@v4 + with: + show-progress: false + + - name: ๐Ÿ Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.11 + cache: pip + cache-dependency-path: setup.py + + - name: ๐Ÿ“ฅ Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y libkrb5-dev + + - name: ๐Ÿ— Install module + run: pip install .[tests] + + - name: ๐Ÿงช Run pytest + run: pytest - name: โฌ†๏ธ Upload coverage to Codecov uses: codecov/codecov-action@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89b619d..1c77a5d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: ๐Ÿ Set up Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: ๐Ÿ‘Š Bump version run: | From e5f54f82f2517ac6d4a7aa14e155d57bd4e0446b Mon Sep 17 00:00:00 2001 From: Jake Adams Date: Mon, 1 Apr 2024 14:47:05 -0600 Subject: [PATCH 4/5] fix: proper check for not raising warnings for pytest 8.x --- tests/test_load.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_load.py b/tests/test_load.py index dcca682..7dfac2a 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -2,6 +2,7 @@ import logging import re import urllib +import warnings from pathlib import Path import numpy as np @@ -739,7 +740,7 @@ def test_add_attachments_by_oid_adds_and_doesnt_warn(self, mocker): updater_mock = mocker.Mock() updater_mock.feature_layer.attachments.add.side_effect = result_dict - with pytest.warns(None) as warning: + with warnings.catch_warnings() as warning: count = load.FeatureServiceAttachmentsUpdater._add_attachments_by_oid(updater_mock, action_df, "path") assert count == 2 @@ -836,7 +837,7 @@ def test_overwrite_attachments_by_oid_overwrites_and_doesnt_warn(self, mocker): updater_mock = mocker.Mock() updater_mock.feature_layer.attachments.update.side_effect = result_dict - with pytest.warns(None) as warning: + with warnings.catch_warnings() as warning: count = load.FeatureServiceAttachmentsUpdater._overwrite_attachments_by_oid(updater_mock, action_df, "path") assert count == 2 From cfb03af56cf293d2855db060f99f9a32376fb4d3 Mon Sep 17 00:00:00 2001 From: Jake Adams Date: Mon, 1 Apr 2024 14:49:10 -0600 Subject: [PATCH 5/5] ci: fix push.yml --- .github/workflows/push.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2b9d58e..9c7bed3 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -31,8 +31,8 @@ jobs: - name: ๐Ÿงช Run pytest run: pytest - - name: โฌ†๏ธ Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - file: ./cov.xml - verbose: true + - name: โฌ†๏ธ Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + file: ./cov.xml + verbose: true