Merge branch 'remove-poetry' into rework-regression-model

Author: PavelCz

Dockerfile

@@ -23,27 +23,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
 
+WORKDIR /reward_preprocessing
+
 ENV PATH="/venv/bin:$PATH"
+COPY ./requirements.txt /reward_preprocessing/
+COPY ./requirements-dev.txt /reward_preprocessing/
 COPY ci/build_and_activate_venv.sh ./ci/build_and_activate_venv.sh
 RUN ci/build_and_activate_venv.sh /venv
 
-RUN curl -sSL https://install.python-poetry.org | python -
-ENV PATH="/root/.local/bin:$PATH"
-
-
-WORKDIR /reward_preprocessing
-# Copy only necessary dependencies to build virtual environment.
-# This minimizes how often this layer needs to be rebuilt.
-COPY poetry.lock pyproject.toml ./
-# Ideally, we'd clear the poetry cache but this seems annoyingly
-# difficult and not worth getting right for this project
-# (I've tried some things from https://github.com/python-poetry/poetry/issues/521
-# without success)
-RUN poetry install --no-interaction --no-ansi
-
-# clear the directory again (this is necessary so that CircleCI can checkout
-# into the directory)
-RUN rm poetry.lock pyproject.toml
 
 # full stage contains everything.
 # Can be used for deployment and local testing.
@@ -55,7 +42,10 @@ COPY . /reward_preprocessing
 # Note that all dependencies were already installed in the previous stage.
 # The purpose of this is only to make the local code available as a package for
 # easier import.
-RUN poetry run python setup.py sdist bdist_wheel
-RUN poetry run pip install dist/reward_preprocessing-*.whl
+RUN python setup.py sdist bdist_wheel
+RUN pip install dist/reward_preprocessing-*.whl
+
+# Move into src directory, so scripts can be run from outside the docker container.
+CMD cd src/
 
-CMD ["poetry", "run", "pytest"]
+CMD ["pytest"]

README.md

@@ -3,15 +3,12 @@
 
 ## Installation
 First clone this repository.
-We use [`poetry`](https://python-poetry.org/) to manage dependencies.
-You can reproduce our environment with
-```
-poetry install
-pip install git+https://github.com/HumanCompatibleAI/imitation
+Install inside your python virtual environment system of choice:
+
+```bash
+pip install -r requirements.txt
+pip install -r requirements-dev.txt  # If dev packages are needed.
 ```
-(run this command inside the cloned repo). This will automatically create a new
-virtual environment.
-Use `poetry shell` to start a shell inside this virtual environment.
 
 Note on the python version: if you use a separate installation of `imitation`
 for creating reward models, then make sure that your environment for `imitation`

ci/build_and_activate_venv.sh

@@ -10,6 +10,9 @@ fi
 virtualenv -p python3.9.5 ${venv}
 source ${venv}/bin/activate
 
+pip install -r requirements.txt
+pip install -r requirements-dev.txt
+
 if [[ $USE_MPI == "True" ]]; then
   pip install mpi4py
 fi

ci/code_checks.sh

@@ -6,5 +6,5 @@ SRC_FILES=(src/ tests/ setup.py)
 set -x  # echo commands
 set -e  # quit immediately on error
 
-poetry run flake8 ${SRC_FILES[@]}
-poetry run black --check ${SRC_FILES[@]}
+flake8 ${SRC_FILES[@]}
+black --check ${SRC_FILES[@]}