File tree Expand file tree Collapse file tree 6 files changed +23
-27
lines changed
Expand file tree Collapse file tree 6 files changed +23
-27
lines changed Original file line number Diff line number Diff line change @@ -76,6 +76,8 @@ export PULP_CONTENT_ORIGIN
7676 ${PULP_HTTPS: +--env PULP_HTTPS} \
7777 ${PULP_OAUTH2: +--env PULP_OAUTH2} \
7878 ${PULP_API_ROOT: +--env PULP_API_ROOT} \
79+ ${PULP_DOMAIN_ENABLED: +--env PULP_DOMAIN_ENABLED} \
80+ ${PULP_ENABLED_PLUGINS: +--env PULP_ENABLED_PLUGINS} \
7981 --env PULP_CONTENT_ORIGIN \
8082 --detach \
8183 --name " pulp-ephemeral" \
Original file line number Diff line number Diff line change 11#!/bin/env python3
2-
32import tomllib
3+ import typing as t
44from pathlib import Path
55
66from packaging .requirements import Requirement
77
8+ GLUE_DIR = "pulp-glue-maven"
9+
10+
11+ def dependencies (path : Path ) -> t .Iterator [Requirement ]:
12+ with (path / "pyproject.toml" ).open ("rb" ) as fp :
13+ pyproject = tomllib .load (fp )
14+
15+ return (Requirement (r ) for r in pyproject ["project" ]["dependencies" ])
16+
17+
818if __name__ == "__main__" :
919 base_path = Path (__file__ ).parent .parent .parent
10- glue_path = "pulp-glue-maven"
11- with (base_path / "pyproject.toml" ).open ("rb" ) as fp :
12- cli_pyproject = tomllib .load (fp )
13-
14- cli_dependency = next (
15- (
16- Requirement (r )
17- for r in cli_pyproject ["project" ]["dependencies" ]
18- if r .startswith ("pulp-cli" )
19- )
20- )
21-
22- with (base_path / glue_path / "pyproject.toml" ).open ("rb" ) as fp :
23- glue_pyproject = tomllib .load (fp )
24-
25- glue_dependency = next (
26- (
27- Requirement (r )
28- for r in glue_pyproject ["project" ]["dependencies" ]
29- if r .startswith ("pulp-glue" )
30- )
31- )
20+ glue_path = base_path / GLUE_DIR
21+
22+ cli_dependency = next ((r for r in dependencies (base_path ) if r .name == "pulp-cli" ))
23+ glue_dependency = next ((r for r in dependencies (glue_path ) if r .name == "pulp-glue" ))
3224
3325 if cli_dependency .specifier != glue_dependency .specifier :
3426 print ("🪢 CLI and GLUE dependencies mismatch:" )
Original file line number Diff line number Diff line change 1212 matrix :
1313 python :
1414 - " 3.11"
15- - " 3.12 "
15+ - " 3.13 "
1616 steps :
1717 - uses : " actions/checkout@v4"
1818 - uses : " actions/cache@v4"
Original file line number Diff line number Diff line change 1212
1313jobs :
1414 test :
15- runs-on : " ubuntu-20 .04"
15+ runs-on : " ubuntu-24 .04"
1616 strategy :
1717 fail-fast : false
1818 matrix :
6464 PULP_HTTPS : " ${{ matrix.pulp_https }}"
6565 PULP_OAUTH2 : " ${{ matrix.pulp_oauth2 }}"
6666 PULP_API_ROOT : " ${{ matrix.pulp_api_root }}"
67+ PULP_DOMAIN_ENABLED : " ${{ matrix.pulp_domain_enabled }}"
68+ PULP_ENABLED_PLUGINS : " ${{ matrix.pulp_enabled_plugins }}"
6769 OAS_VERSION : " ${{ matrix.oas_version }}"
6870 run : |
6971 .ci/run_container.sh make test
Original file line number Diff line number Diff line change 11# Lint requirements
22black==25.1.0
3- flake8==7.1.2
3+ flake8==7.2.0
44flake8-pyproject==1.2.3
55isort==6.0.1
66mypy==1.15.0
Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ line-length = 100
116116# This section is managed by the cookiecutter templates.
117117profile = " black"
118118line_length = 100
119- skip = [" pulp-glue-maven" ]
119+ extend_skip = [" pulp-glue-maven" ]
120120
121121[tool .pytest .ini_options ]
122122markers = [
You can’t perform that action at this time.
0 commit comments