Use flatland-rl 4.0.4. (#162)

Author: chenkins

evaluation/compute_worker/tasks_docker_compose.py

@@ -30,7 +30,7 @@
 S3_UPLOAD_PATH_TEMPLATE_USE_SUBMISSION_ID = os.getenv("S3_UPLOAD_PATH_TEMPLATE_USE_SUBMISSION_ID", None)
 
 BENCHMARKING_NETWORK = os.environ.get("BENCHMARKING_NETWORK", None)
-SUPPORTED_CLIENT_VERSIONS = os.environ.get("SUPPORTED_CLIENT_VERSIONS", "4.0.3,4.0.3.dev23+gaa5df390,4.0.3.dev23+g31763152,4.0.3.dev26+g7d2da62c")
+SUPPORTED_CLIENT_VERSIONS = os.environ.get("SUPPORTED_CLIENT_VERSIONS", "4.0.4,4.0.3")
 
 
 # https://celery.school/custom-celery-task-logger

evaluation/evaluator/Dockerfile

@@ -1,8 +1,6 @@
 FROM continuumio/miniconda3
 
 RUN apt-get update && apt-get install gcc build-essential wget zip -y
-# TODO temporary workaround till 4.0.4 is released (https://github.com/flatland-association/flatland-rl/pull/112)
-RUN apt-get install git -y
 
 # Replace shell with bash so we can source files
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
@@ -21,8 +19,6 @@ RUN set -e && set -x && conda --version  && \
     source activate base && \
     conda env list  && \
     conda activate flatland-rl && \
-    # TODO temporary workaround till 4.0.4 is released (https://github.com/flatland-association/flatland-rl/pull/112)
-    git clone https://github.com/flatland-association/flatland-rl.git /tmp/flatland-rl && cd /tmp/flatland-rl && git checkout feature/dump-evaluation-state && python -m pip install  -r requirements-dev.txt && python -m build && python -m pip install /tmp/flatland-rl/dist/flatland_rl-4.0.3.*.tar.gz && python -m pip list && \
     python -c 'from flatland.evaluators.service import FlatlandRemoteEvaluationService'
 
 COPY run.sh ./

evaluation/evaluator/environment.yml

@@ -3,4 +3,4 @@ dependencies:
   - python==3.10.16
   - pip:
       - pyyaml
-      - flatland-rl==4.0.3
+      - flatland-rl==4.0.4