Skip to content

Commit e2842fc

Browse files
authored
deps: relax (#352)
* deps: relax * fix: uv system python * fix: deps
1 parent 1d06a19 commit e2842fc

File tree

2 files changed

+33
-41
lines changed

2 files changed

+33
-41
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,18 @@ 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:
@@ -120,14 +124,14 @@ jobs:
120124
--health-interval 10s
121125
--health-timeout 5s
122126
--health-retries 5
123-
124127
steps:
125128
- uses: actions/checkout@v3
129+
- uses: astral-sh/setup-uv@v5
126130
- name: Install pypgstac
127131
working-directory: /__w/pgstac/pgstac/src/pypgstac
128-
run: |
129-
pip install .[dev,test,psycopg];
130-
132+
run: uv pip install ${{ matrix.flags }} .[dev,test,psycopg]
133+
env:
134+
UV_SYSTEM_PYTHON: 1
131135
- name: Run tests
132136
working-directory: /__w/pgstac/pgstac/docker/pypgstac/bin
133137
run: |

src/pypgstac/pyproject.toml

Lines changed: 24 additions & 36 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,24 +18,24 @@ classifiers = [
2018
"Programming Language :: Python :: 3.11",
2119
]
2220
dependencies = [
23-
"cachetools==5.3.*",
24-
"fire==0.4.*",
25-
"hydraters==0.1.*",
26-
"orjson>=3.6.2",
27-
"plpygis==0.2.*",
21+
"cachetools>=5.3.0",
22+
"fire>=0.4.0",
23+
"hydraters>=0.1.0",
24+
"orjson>=3.7.0",
25+
"plpygis>=0.2.0",
2826
"pydantic>=1.7",
29-
"python-dateutil==2.8.*",
30-
"smart-open>=4.2",
31-
"tenacity==8.1.*",
27+
"python-dateutil>=2.8.0",
28+
"smart-open>=5.0",
29+
"tenacity>=8.1.0",
3230
"version-parser>= 1.0.1",
3331
]
3432

3533
[project.optional-dependencies]
3634
test = [
37-
"pytest",
38-
"pytest-cov",
35+
"pytest==8.3.*",
36+
"pytest-cov==6.0.*",
3937
"pystac[validation]==1.*",
40-
"types-cachetools",
38+
"types-cachetools==5.5.*",
4139
]
4240
dev = [
4341
"flake8==7.1.1",
@@ -47,14 +45,8 @@ dev = [
4745
"ruff==0.8.2",
4846
"pre-commit",
4947
]
50-
psycopg = [
51-
"psycopg[binary]==3.1.*",
52-
"psycopg-pool==3.1.*",
53-
]
54-
migrations = [
55-
"psycopg2-binary",
56-
"migra"
57-
]
48+
psycopg = ["psycopg[binary]==3.1.*", "psycopg-pool==3.1.*"]
49+
migrations = ["psycopg2-binary", "migra"]
5850

5951

6052
[project.urls]
@@ -76,22 +68,18 @@ branch = true
7668
parallel = true
7769

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

8573
[tool.ruff.lint]
8674
select = [
87-
"E", # pycodestyle errors
88-
"W", # pycodestyle warnings
89-
"F", # pyflakes
90-
"I", # isort
91-
"C", # flake8-comprehensions
92-
"B", # flake8-bugbear
75+
"E", # pycodestyle errors
76+
"W", # pycodestyle warnings
77+
"F", # pyflakes
78+
"I", # isort
79+
"C", # flake8-comprehensions
80+
"B", # flake8-bugbear
9381
# "D", # pydocstyle
94-
"C4", # flake8-comprehensions
82+
"C4", # flake8-comprehensions
9583
"T20", # flake8-print
9684
# "PT", # flake8-pytest-style
9785
"Q", # flake8-quotes
@@ -106,8 +94,8 @@ select = [
10694
]
10795
ignore = [
10896
# "E501", # line too long, handled by black
109-
"B008", # do not perform function calls in argument defaults
110-
"C901", # too complex
97+
"B008", # do not perform function calls in argument defaults
98+
"C901", # too complex
11199
"B905",
112100
]
113101

0 commit comments

Comments
 (0)