Skip to content

Commit 1344206

Browse files
committed
deps: relax
1 parent 1d06a19 commit 1344206

File tree

2 files changed

+28
-42
lines changed

2 files changed

+28
-42
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,32 +102,35 @@ jobs:
102102
name: test
103103
needs: [changes, buildpg, buildpyrust]
104104
runs-on: ubuntu-latest
105+
strategy:
106+
matrix:
107+
flags:
108+
- ""
109+
- "--resolution lowest-direct"
105110
container:
106111
image: ${{ needs.changes.outputs.pyrustdocker }}
107112
env:
108113
PGPASSWORD: postgres
109114
PGHOST: postgres
110115
PGDATABASE: postgres
111116
PGUSER: postgres
112-
113117
services:
114118
postgres:
115119
env:
116120
POSTGRES_PASSWORD: postgres
121+
UV_SYSTEM_PYTHON: 1
117122
image: ${{ needs.changes.outputs.pgdocker }}
118123
options: >-
119124
--health-cmd pg_isready
120125
--health-interval 10s
121126
--health-timeout 5s
122127
--health-retries 5
123-
124128
steps:
125129
- uses: actions/checkout@v3
130+
- uses: astral-sh/setup-uv@v5
126131
- name: Install pypgstac
127132
working-directory: /__w/pgstac/pgstac/src/pypgstac
128-
run: |
129-
pip install .[dev,test,psycopg];
130-
133+
run: uv pip install ${{ matrix.flags }} .[dev,test,psycopg]
131134
- name: Run tests
132135
working-directory: /__w/pgstac/pgstac/docker/pypgstac/bin
133136
run: |

src/pypgstac/pyproject.toml

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ description = "Schema, functions and a python library for storing and accessing
55
readme = "README.md"
66
requires-python = ">=3.8"
77
license = "MIT"
8-
authors = [
9-
{name = "David Bitner", email = "[email protected]"},
10-
]
8+
authors = [{ name = "David Bitner", email = "[email protected]" }]
119
keywords = ["STAC", "Postgresql", "PgSTAC"]
1210
classifiers = [
1311
"Intended Audience :: Developers",
@@ -20,25 +18,20 @@ classifiers = [
2018
"Programming Language :: Python :: 3.11",
2119
]
2220
dependencies = [
23-
"cachetools==5.3.*",
24-
"fire==0.4.*",
25-
"hydraters==0.1.*",
21+
"cachetools>=5.3.0",
22+
"fire>=0.4.0",
23+
"hydraters>=0.1.0",
2624
"orjson>=3.6.2",
27-
"plpygis==0.2.*",
25+
"plpygis>=0.2.0",
2826
"pydantic>=1.7",
29-
"python-dateutil==2.8.*",
27+
"python-dateutil>=2.8.0",
3028
"smart-open>=4.2",
31-
"tenacity==8.1.*",
29+
"tenacity>=8.1.0",
3230
"version-parser>= 1.0.1",
3331
]
3432

3533
[project.optional-dependencies]
36-
test = [
37-
"pytest",
38-
"pytest-cov",
39-
"pystac[validation]==1.*",
40-
"types-cachetools",
41-
]
34+
test = ["pytest", "pytest-cov", "pystac[validation]==1.*", "types-cachetools"]
4235
dev = [
4336
"flake8==7.1.1",
4437
"black>=24.10.0",
@@ -47,14 +40,8 @@ dev = [
4740
"ruff==0.8.2",
4841
"pre-commit",
4942
]
50-
psycopg = [
51-
"psycopg[binary]==3.1.*",
52-
"psycopg-pool==3.1.*",
53-
]
54-
migrations = [
55-
"psycopg2-binary",
56-
"migra"
57-
]
43+
psycopg = ["psycopg[binary]==3.1.*", "psycopg-pool==3.1.*"]
44+
migrations = ["psycopg2-binary", "migra"]
5845

5946

6047
[project.urls]
@@ -76,22 +63,18 @@ branch = true
7663
parallel = true
7764

7865
[tool.coverage.report]
79-
exclude_lines = [
80-
"no cov",
81-
"if __name__ == .__main__.:",
82-
"if TYPE_CHECKING:",
83-
]
66+
exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
8467

8568
[tool.ruff.lint]
8669
select = [
87-
"E", # pycodestyle errors
88-
"W", # pycodestyle warnings
89-
"F", # pyflakes
90-
"I", # isort
91-
"C", # flake8-comprehensions
92-
"B", # flake8-bugbear
70+
"E", # pycodestyle errors
71+
"W", # pycodestyle warnings
72+
"F", # pyflakes
73+
"I", # isort
74+
"C", # flake8-comprehensions
75+
"B", # flake8-bugbear
9376
# "D", # pydocstyle
94-
"C4", # flake8-comprehensions
77+
"C4", # flake8-comprehensions
9578
"T20", # flake8-print
9679
# "PT", # flake8-pytest-style
9780
"Q", # flake8-quotes
@@ -106,8 +89,8 @@ select = [
10689
]
10790
ignore = [
10891
# "E501", # line too long, handled by black
109-
"B008", # do not perform function calls in argument defaults
110-
"C901", # too complex
92+
"B008", # do not perform function calls in argument defaults
93+
"C901", # too complex
11194
"B905",
11295
]
11396

0 commit comments

Comments
 (0)