Skip to content

Commit

Permalink
fixed imports
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz committed Dec 19, 2023
1 parent d211dbf commit 217a54a
Show file tree
Hide file tree
Showing 7 changed files with 177 additions and 159 deletions.
25 changes: 19 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
FROM python:3.11.4-buster
RUN apt-get update -y
RUN apt-get install -y build-essential

RUN apt-get update -y \
&& apt-get install -y build-essential \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /code
ADD requirements.txt /code

# Copy requirements and install them first to leverage Docker cache
COPY requirements.txt /code
RUN pip install -r requirements.txt
ADD requirements.yml /code
ADD ansible.cfg /etc/ansible/

COPY requirements.yml /code
COPY ansible.cfg /etc/ansible/
RUN ansible-galaxy install -r requirements.yml
ADD . /code

# Copy the entire project
COPY . /code

# Set PYTHONPATH to include the project root
ENV PYTHONPATH /code

WORKDIR /code/simple_vm_client
1 change: 0 additions & 1 deletion simple_vm_client/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
__all__ = ['ttypes', 'constants', 'VirtualMachineService']
File renamed without changes.
6 changes: 3 additions & 3 deletions simple_vm_client/forc_connector/template/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@

import requests
import yaml
from ttypes import ResearchEnvironmentTemplate
from util.logger import setup_custom_logger

from simple_vm_client.ttypes import ResearchEnvironmentTemplate
from simple_vm_client.util.logger import setup_custom_logger

# from resenv.backend.Backend import Backend

Expand Down Expand Up @@ -116,7 +117,6 @@ def update_playbooks(self) -> None:
for template_metadata in templates_metadata:
try:
if template_metadata.get(NEEDS_FORC_SUPPORT, False):

metadata = ResearchEnvironmentMetadata(
name=template_metadata[TEMPLATE_NAME],
port=template_metadata[PORT],
Expand Down
Binary file not shown.
Loading

0 comments on commit 217a54a

Please sign in to comment.