Skip to content

Commit 6a72d06

Browse files
committed
Fix dockerfile for assignments after python upgrade
1 parent 3f3ebcf commit 6a72d06

12 files changed

+14
-15
lines changed

assignments/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ WORKDIR /opt/tests/
55

66
ENV DEBIAN_FRONTEND=noninteractive
77
RUN apt-get update && \
8-
apt-get install -y --no-install-recommends python3-venv && \
8+
apt-get upgrade -y python3 && \
9+
apt-get install -y --no-install-recommends python3-venv python3-pip && \
910
rm -rf /var/lib/apt/lists/*
1011

1112
COPY requirements.txt .
1213

13-
RUN python3 -m venv .venv
14-
ENV PATH="/opt/tests/.venv/bin:${PATH}"
15-
RUN pip install wheel
16-
RUN pip install -r requirements.txt
14+
RUN pip3 install wheel
15+
RUN pip3 install -r requirements.txt
1716

assignments/__init__.py

Whitespace-only changes.

assignments/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66

77
from glob import glob
8-
from helpers import definir_path_resultados, comprobar_resultados_en_hdfs
8+
from .helpers import definir_path_resultados, comprobar_resultados_en_hdfs
99

1010
spark_home = os.environ.get('SPARK_HOME', None)
1111
if not spark_home:

assignments/contenedores.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pyspark import SparkContext
22
from pyspark.sql import SQLContext, Row
33

4-
from helpers import *
4+
from .helpers import *
55

66
path_containers = 'data/containers.csv'
77

assignments/test_ejercicio_0.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22

3-
from contenedores import *
3+
from .contenedores import *
44

55
def test_ejercicio_0_crea_secuencia_de_10_elementos(spark_context, path_resultados):
66
resultado = ejercicio_0(spark_context, path_resultados)

assignments/test_ejercicio_1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22

3-
from contenedores import *
3+
from .contenedores import *
44

55
def test_ejercicio_1_cuenta_correctamente_el_numero_de_lineas(spark_context, path_resultados):
66
resultado = ejercicio_1(spark_context, path_resultados)

assignments/test_ejercicio_2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import pytest
33

4-
from contenedores import *
4+
from .contenedores import *
55

66
@pytest.fixture(scope="session")
77
def resultados(spark_context, path_resultados):

assignments/test_ejercicio_3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import pytest
33

4-
from contenedores import *
4+
from .contenedores import *
55
from pyspark.sql import SQLContext
66

77
def test_ejercicio_3_data_frame_tiene_613_filas(resultados_ejercicio_3):

assignments/test_ejercicio_4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import pytest
33

4-
from contenedores import *
4+
from .contenedores import *
55
from pyspark.sql import SQLContext
66

77
@pytest.fixture(scope="session")

assignments/test_ejercicio_5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import pytest
33

4-
from contenedores import *
4+
from .contenedores import *
55

66
@pytest.fixture(scope="session")
77
def resultados(spark_context, path_resultados):

0 commit comments

Comments
 (0)