From 0a36669cc2215bb8665b641c3f3e8e58240ebac6 Mon Sep 17 00:00:00 2001 From: ld-archer Date: Fri, 23 Oct 2020 10:24:59 +0100 Subject: [PATCH] Fixed the requirements for SPENSER packages and added flag to the README for short term fix (until python-pip updates) --- README.md | 4 ++-- requirements.txt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cc7b102..c42ae68 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Daedalus

- +

DOI @@ -56,7 +56,7 @@ git clone https://github.com/BenjaminIsaac0111/daedalus.git ``` cd /path/to/my/daedalus -pip install -v -e . +pip install --use-feature=2020-resolver -v -e . ``` # Tutorials diff --git a/requirements.txt b/requirements.txt index e55af2f..796c93d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,10 +4,10 @@ pytest~=6.0.1 daedalus~=0.0.1 pandas~=0.24.2 numpy~=1.19.1 -#humanleague~=2.1.1 -#ukcensusapi~=1.1.6 -#microsimulation~=0.0.1 -#ukpopulation~=1.2.1 +humanleague~=2.1.1 +ukcensusapi~=1.1.5 +microsimulation @ git+https://github.com/nismod/microsimulation.git@Development#egg=microsimulation +ukpopulation~=1.2.1 setuptools~=49.2.0 matplotlib~=3.2.2 vivarium_public_health @ git+https://github.com/alan-turing-institute/vivarium_public_health_spenser.git@develop#egg=vivarium_public_health_spenser