Skip to content

Commit

Permalink
updating new files and a few fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BDonnot committed Jun 22, 2021
1 parent abcddb4 commit d06cc84
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
14 changes: 5 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,16 @@ RUN apt-get update && \
git \
ssh \
tar \
gzip
gzip \
ca-certificates

# Retrieve Grid2Op
RUN git clone https://github.com/rte-france/Grid2Op
RUN git clone https://github.com/BDonnot/Grid2Op

# Install Grid2Op
# Install in edit mode for testing
WORKDIR /Grid2Op
# Use the latest release
RUN git pull
RUN git remote update
RUN git fetch --all --tags
RUN git checkout "tags/v1.6.0" -b "v1.6.0-branch"
# Install Dependencies
RUN pip3 install .[optional,challenge]
RUN pip3 install -e .[optional]
WORKDIR /

# Make port 80 available to the world outside this container
Expand Down
3 changes: 2 additions & 1 deletion utils/make_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def modify_and_push_docker(version, # grid2op version
"script \"update_version\": version should be formated as XX.YY.ZZ (eg 0.3.1). "
"Please modify \"--version\" argument")

regex_version = "[0-9]+\.[0-9]+\.[0-9]+(.post[0-9]+){0,1}"
regex_version = "[0-9]+\.[0-9]+\.[0-9]+(.post[0-9]+){0,1}(.rc[0-9]+){0,1}"
if re.match("^{}$".format(regex_version), version) is None:
raise RuntimeError(
"script \"update_version\": version should be formated as XX.YY.ZZ (eg 0.3.1) and not {}. "
Expand All @@ -93,6 +93,7 @@ def modify_and_push_docker(version, # grid2op version
old_version = re.sub("version=", "", old_version)
old_version = re.sub("'", "", old_version)
old_version = re.sub('"', "", old_version)
old_version = re.sub("\\.rc[0-9]+", "", old_version)
if version < old_version:
raise RuntimeError("You provided the \"new\" version \"{}\" which is older (or equal) to the current version "
"found: \"{}\".".format(version, old_version))
Expand Down

0 comments on commit d06cc84

Please sign in to comment.