Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.7
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/tox-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Tox tests
on: [push, pull_request]

jobs:
py39:
py3:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
Expand All @@ -12,11 +12,11 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
run: tox -e py39 -vv
run: tox -e py314 -vv
black:
runs-on: ubuntu-latest
steps:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand All @@ -84,11 +84,11 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
run: tox -e py39
run: tox -e py3
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
env:
Expand All @@ -105,7 +105,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.9
python-version: 3.14
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand Down
4 changes: 1 addition & 3 deletions src/pubtools/sign/ansible/msg_clear_sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@
# values.
{0}
{1}
""".format(
yaml.dump(MsgSignerResults.doc_arguments()), yaml.dump(ClearSignResult.doc_arguments())
)
""".format(yaml.dump(MsgSignerResults.doc_arguments()), yaml.dump(ClearSignResult.doc_arguments()))


def run_module() -> None:
Expand Down
1 change: 0 additions & 1 deletion src/pubtools/sign/signers/cosignsigner.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from ..utils import set_log_level, run_command, _get_config_file, run_in_parallel, FData
from ..clients.registry import ContainerRegistryClient, AuthTokenWrapper


LOG = logging.getLogger("pubtools.sign.signers.cosignsigner")


Expand Down
1 change: 0 additions & 1 deletion src/pubtools/sign/signers/msgsigner.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
FData,
)


LOG = logging.getLogger("pubtools.sign.signers.msgsigner")
LOG.setLevel(logging.INFO)

Expand Down
47 changes: 20 additions & 27 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

from pubtools.sign.clients.msg import _MsgClient


LOG = logging.getLogger("pubtools.sign.signers.radas")
LOG.addHandler(logging.StreamHandler(sys.stdout))

Expand Down Expand Up @@ -258,8 +257,16 @@ def on_message(self, event):
sender.send(reply)


def run_broker(broker, stdout):
sys.stdout = stdout
def run_broker(port): # broker, stdout):
broker = Container(_Broker(f"localhost:{port}"))
# sys.stdout = stdout
broker.run()
return broker


def run_broken_broker(port): # broker, stdout):
broker = Container(_Broker(f"localhost:{port}"))
# sys.stdout = stdout
broker.run()


Expand Down Expand Up @@ -314,21 +321,19 @@ def f_find_available_port_for_broken():
@fixture(scope="session")
def f_qpid_broker(f_find_available_port):
LOG.info("starting broker", f"localhost:{f_find_available_port}")
broker = Container(_Broker(f"localhost:{f_find_available_port}"))
p = Process(target=run_broker, args=(broker, sys.stdout))
p = Process(target=run_broker, args=(f_find_available_port,))
p.start()
yield (broker, f_find_available_port)
yield (f_find_available_port,)
LOG.info("destroying qpid broker")
p.terminate()


@fixture(scope="session")
def f_broken_qpid_broker(f_find_available_port_for_broken):
LOG.debug("starting broker", f"localhost:{f_find_available_port_for_broken}")
broker = Container(_BrokenBroker(f"localhost:{f_find_available_port_for_broken}"))
p = Process(target=broker.run, args=())
p = Process(target=run_broken_broker, args=())
p.start()
yield (broker, f_find_available_port_for_broken)
yield (f_find_available_port_for_broken,)
LOG.debug("destroying qpid broker")
p.terminate()

Expand Down Expand Up @@ -380,8 +385,7 @@ def f_fake_msgsigner_stray(
@fixture
def f_client_certificate():
with tempfile.NamedTemporaryFile() as tmpf:
tmpf.write(
"""
tmpf.write("""
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1y5rshMkYqfP2
k7z2IJXto3AvLCAYDN9WX5mUUFgPFAFur38bDopqj5dSkXlR5f3MwZeRCNsxRXKD
Expand Down Expand Up @@ -432,19 +436,15 @@ def f_client_certificate():
aoKJ9jBURYeYzd/Zi2RPLpjt8TYPir8vKQ==
-----END CERTIFICATE-----

""".encode(
"utf-8"
)
)
""".encode("utf-8"))
tmpf.flush()
yield tmpf.name


@fixture
def f_ca_certificate():
with tempfile.NamedTemporaryFile() as tmpf:
tmpf.write(
"""
tmpf.write("""
-----BEGIN CERTIFICATE-----
MIIDtzCCAp+gAwIBAgIUATUd1WliG6ETZqKP8EZyijG9xUIwDQYJKoZIhvcNAQEL
BQAwazELMAkGA1UEBhMCdVMxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEQMA4GA1UE
Expand All @@ -466,19 +466,15 @@ def f_ca_certificate():
tcKssr4IEdgeVNco+UStQrrIrf+KoPN147fKzwkaUZKj3ybVExHnilr4D+HB94jL
pH404Fud+v2NWjl7RSQnsMw+gCz6Sm3eU/aWC5L5ZOecawj01Qr60nv97eqc8tdG
TrXd8yRh0cI5wL5KnO4hL/kYwOOaKsMwEkNlmL2Io7DrhVgJUAWycqfHfA==
-----END CERTIFICATE-----""".encode(
"utf-8"
)
)
-----END CERTIFICATE-----""".encode("utf-8"))
tmpf.flush()
yield tmpf.name


@fixture
def f_config_msg_signer_missing():
with tempfile.NamedTemporaryFile() as tmpf:
tmpf.write(
f"""
tmpf.write(f"""
msg_signer:
messaging_brokers:
- amqps://broker-01:5671
Expand All @@ -491,10 +487,7 @@ def f_config_msg_signer_missing():
timeout: 1
retries: 3
message_id_key: request_id
log_level: debug""".encode(
"utf-8"
)
)
log_level: debug""".encode("utf-8"))
tmpf.flush()
yield tmpf.name

Expand Down
24 changes: 6 additions & 18 deletions tests/conftest_cosignsig.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,54 +13,42 @@ def f_cosign_signer(f_config_msg_signer_ok):
@fixture
def f_config_cosign_signer_ok(f_client_certificate):
with tempfile.NamedTemporaryFile() as tmpf:
tmpf.write(
"""
tmpf.write("""
cosign_signer:
timeout: 30s
rekor_url: https://rekor.sigstore.dev
registry_user: some-user
registry_password: some-password
retries: 1
log_level: debug
""".encode(
"utf-8"
)
)
""".encode("utf-8"))
tmpf.flush()
yield tmpf.name


@fixture
def f_config_cosign_signer_aliases(f_client_certificate):
with tempfile.NamedTemporaryFile() as tmpf:
tmpf.write(
"""
tmpf.write("""
cosign_signer:
timeout: 30s
rekor_url: https://rekor.sigstore.dev
log_level: debug
key_aliases:
beta: abcde1245
""".encode(
"utf-8"
)
)
""".encode("utf-8"))
tmpf.flush()
yield tmpf.name


@fixture
def f_config_cosign_signer_no_auth(f_client_certificate):
with tempfile.NamedTemporaryFile() as tmpf:
tmpf.write(
"""
tmpf.write("""
cosign_signer:
timeout: 30s
rekor_url: https://rekor.sigstore.dev
log_level: debug
""".encode(
"utf-8"
)
)
""".encode("utf-8"))
tmpf.flush()
yield tmpf.name
Loading
Loading