Skip to content

Commit c6ddabd

Browse files
authored
remove support for Pants v2.25 (#117)
1 parent 2e64ffd commit c6ddabd

File tree

7 files changed

+3
-1718
lines changed

7 files changed

+3
-1718
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo "ERROR: No wheel found in dist." 1>&2
4040
exit 1
4141
fi
42-
for pants_version in 2.27 2.26 2.25; do
42+
for pants_version in 2.29 2.28 2.27 2.26 ; do
4343
if [ ! -r dist/shoalsoft-pants-opentelemetry-plugin-pants${pants_version}-*.pex ]; then
4444
echo "ERROR: No PEX file found for Pants version $pants_version." 1>&2
4545
exit 1

3rdparty/python/BUILD

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,6 @@ python_requirements(
5454
},
5555
)
5656

57-
python_requirements(
58-
name="pants-2.25",
59-
source="pants-2.25.txt",
60-
resolve="pants-2.25",
61-
module_mapping={
62-
"opentelemetry-proto": ["opentelemetry.proto"],
63-
"pantsbuild.pants": ["pants"],
64-
"pantsbuild.pants.testutil": ["pants.testutil"],
65-
},
66-
type_stubs_module_mapping={
67-
"types-grpcio": ["grpc"],
68-
},
69-
)
70-
7157
python_requirements(
7258
name="pytest",
7359
source="pytest-requirements.txt",

3rdparty/python/pants-2.25.lock

Lines changed: 0 additions & 1669 deletions
This file was deleted.

3rdparty/python/pants-2.25.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

pants.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ default_resolve = "pants-2.28"
2222
"pants-2.28" = "3rdparty/python/pants-2.28.lock"
2323
"pants-2.27" = "3rdparty/python/pants-2.27.lock"
2424
"pants-2.26" = "3rdparty/python/pants-2.26.lock"
25-
"pants-2.25" = "3rdparty/python/pants-2.25.lock"
2625
pytest = "3rdparty/python/pytest.lock"
2726
mypy = "3rdparty/python/mypy.lock"
2827

src/python/shoalsoft/pants_opentelemetry_plugin/BUILD

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
PLUGIN_VERSION = "0.4.1"
1616

17-
PANTS_MAJOR_MINOR_VERSIONS = ["2.29", "2.28", "2.27", "2.26", "2.25"]
17+
PANTS_MAJOR_MINOR_VERSIONS = ["2.29", "2.28", "2.27", "2.26"]
1818

1919
python_sources(
2020
sources=["*.py", "!*_test.py", "!*_integration_test.py"],
@@ -34,10 +34,6 @@ python_sources(
3434
"pants-2.26",
3535
resolve="pants-2.26",
3636
),
37-
**parametrize(
38-
"pants-2.25",
39-
resolve="pants-2.25",
40-
),
4137
)
4238

4339
python_tests(
@@ -59,10 +55,6 @@ python_tests(
5955
"pants-2.26",
6056
resolve="pants-2.26",
6157
),
62-
**parametrize(
63-
"pants-2.25",
64-
resolve="pants-2.25",
65-
),
6658
)
6759

6860
python_tests(
@@ -108,12 +100,6 @@ pex_binary(
108100
dependencies=["3rdparty/python:pants-2.26#pantsbuild.pants"],
109101
output_path="pants-2.26.pex",
110102
),
111-
**parametrize(
112-
"pants-2.25",
113-
resolve="pants-2.25",
114-
dependencies=["3rdparty/python:pants-2.25#pantsbuild.pants"],
115-
output_path="pants-2.25.pex",
116-
),
117103
)
118104

119105

src/python/shoalsoft/pants_opentelemetry_plugin/opentelemetry_integration_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def do_test_of_json_file_exporter(
254254
)
255255

256256

257-
@pytest.mark.parametrize("pants_version_str", ["2.29.0a0", "2.28.0", "2.27.0", "2.26.2", "2.25.3"])
257+
@pytest.mark.parametrize("pants_version_str", ["2.29.0a0", "2.28.0", "2.27.0", "2.26.2"])
258258
def test_opentelemetry_integration(subtests, pants_version_str: str) -> None:
259259
pants_version = Version(pants_version_str)
260260
pants_major_minor = f"{pants_version.major}.{pants_version.minor}"

0 commit comments

Comments
 (0)