Skip to content

Commit

Permalink
Fixed git workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ckunki committed Oct 23, 2024
1 parent 10d9f9b commit 432d19b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
poetry.lock linguist-generated=true
poetry.lock linguist-generated
doc/changes/changelog.md linguist-generated
3 changes: 1 addition & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ jobs:
- name: Calculate Test Coverage
run: poetry run nox -s coverage -- -- --db-version ${{ matrix.exasol-version }}
env:
PYTEST_ADDOPTS="
-W 'ignore::DeprecationWarning:luigi:'
PYTEST_ADDOPTS: "-W 'ignore::DeprecationWarning:luigi:'
-W 'ignore::DeprecationWarning:pkg_resources:'
-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'
-W 'ignore:Deprecated call to \`pkg_resources.declare_namespace:DeprecationWarning'
Expand Down
2 changes: 1 addition & 1 deletion doc/changes/changes_0.4.0.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 0.4.0 - 2024-10-22
# 0.4.0 - 2024-10-23

## Summary

Expand Down
19 changes: 0 additions & 19 deletions exasol/nb_connector/itde_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@
from exasol.nb_connector.container_by_ip import ContainerByIp, IPRetriever
from exasol.nb_connector.secret_store import Secrets

import logging
LOG = logging.getLogger(__name__)
LOG.setLevel(logging.DEBUG)
logging.basicConfig(
format="%(asctime)s %(levelname)-7s %(filename)s: %(message)s",
datefmt="%Y-%m-%d %X",
)

# if __name__ == "__main__":
# LOG.info("info")
# LOG.debug("debug")


ENVIRONMENT_NAME = "DemoDb"
NAME_SERVER_ADDRESS = "8.8.8.8"
Expand Down Expand Up @@ -113,24 +101,17 @@ def bring_itde_up(conf: Secrets, env_info: Optional[EnvironmentInfo] = None) ->

def _get_current_container(docker_client: docker.DockerClient):
ip_addresses = _get_ipv4_addresses()
LOG.debug(f"_get_current_container: ip_addresses = {ip_addresses}")
return ContainerByIp(docker_client).find(ip_addresses)


def _add_current_container_to_db_network(network_name: str) -> None:
LOG.debug(f"_add_current_container_to_db_network({network_name})")
with ContextDockerClient() as docker_client:
container = _get_current_container(docker_client)
LOG.debug(f"- container = {container and container.name}")
if not container:
return
network = _get_docker_network(docker_client, network_name)
LOG.debug(f"- network = {network}")
if network and not _is_container_connected_to_network(container, network):
LOG.debug(f"- connecting container {container.id} to the network")
network.connect(container.id)
else:
LOG.debug("- either network is falsy or container is already connected")



Expand Down

0 comments on commit 432d19b

Please sign in to comment.