Skip to content

Commit 1d4f02e

Browse files
authored
Remove pipenv install from Makefile (#299)
This removes the install of `pipenv` from the Makefile. Instead, mandating that users should install it on their own system-wide. In addition , it fixes the pyproject.toml to use the [new metadata](https://ichard26.github.io/blog/2025/01/whats-new-in-pip-25.0/#key-features) for `license-expression` and `license-file`.
1 parent 1a28963 commit 1d4f02e

File tree

7 files changed

+32
-25
lines changed

7 files changed

+32
-25
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ git clone git@github.com:bufbuild/protovalidate-python.git
1919
cd protovalidate-python
2020
```
2121

22-
Then, make any changes you'd like. We use a Makefile to test and lint our code,
23-
so you'll need a few non-Python tools:
22+
Next, install dependencies. You will need:
23+
24+
* Python >=v3.9
25+
* [Pipenv](https://pipenv.pypa.io/en/latest/index.html)
26+
27+
We use a Makefile to test and lint our code, so you'll also need a few non-Python tools:
2428

2529
* GNU Make (to use the Makefile): part of the `build-essential` package on
2630
Debian-derived Linux distributions (including Ubuntu), and part of

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
uses: actions/setup-python@v5
3333
with:
3434
python-version: ${{ matrix.python-version }}
35+
cache: "pipenv"
36+
- run: ${{steps.python.outputs.python-path}} -m pip install --upgrade pip pipenv
3537
- name: Execute tests
3638
run: make test PYTHON=${{ steps.python.outputs.python-path }}
3739
- name: Lint

.github/workflows/conformance.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@ jobs:
3232
uses: actions/setup-python@v5
3333
with:
3434
python-version: ${{ matrix.python-version }}
35+
cache: "pipenv"
36+
- run: ${{steps.python.outputs.python-path}} -m pip install --upgrade pip pipenv
3537
- name: Test conformance
3638
run: make conformance PYTHON=${{ steps.python.outputs.python-path }}

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ lint: install ## Lint code
6262

6363
.PHONY: install
6464
install: ## Install dependencies
65-
$(PYTHON) -m pip install --upgrade pip pipenv
6665
pipenv --python $(PYTHON) sync --dev
6766

6867
.PHONY: checkgenerate

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protobuf = "==6.*"
1111
pytest = "*"
1212
mypy = "*"
1313
ruff = "*"
14-
types-protobuf = "*"
14+
types-protobuf = "==6.30.2.20250503"
1515
exceptiongroup = "*"
1616
tomli = "*"
1717

Pipfile.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ build-backend = "hatchling.build"
66
name = "protovalidate"
77
description = "Protocol Buffer Validation for Python"
88
readme = "README.md"
9-
license = { file = "LICENSE" }
9+
license-expression = "Apache 2.0"
10+
license-file = "LICENSE"
1011
keywords = ["validate", "protobuf", "protocol buffer"]
1112
requires-python = ">=3.9"
1213
classifiers = [
@@ -15,7 +16,6 @@ classifiers = [
1516
"Programming Language :: Python :: 3.11",
1617
"Programming Language :: Python :: 3.12",
1718
"Programming Language :: Python :: 3.13",
18-
"License :: OSI Approved :: Apache Software License",
1919
"Operating System :: OS Independent",
2020
"Typing :: Typed",
2121
]

0 commit comments

Comments
 (0)