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

deps: bump the major-dependencies group with 6 updates #86

Merged
merged 5 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
56 changes: 28 additions & 28 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ 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: ⬆️ Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
file: ./cov.xml
verbose: true
- 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
with:
file: ./cov.xml
verbose: true
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
},
keywords=["gis"],
install_requires=[
"arcgis==2.2.*",
"arcgis>=2.2,<2.3",
"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",
Expand All @@ -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.*",
]
Expand Down
5 changes: 3 additions & 2 deletions tests/test_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import logging
import re
import urllib
import warnings
from pathlib import Path

import numpy as np
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading