From a424d73b251429a51223af00cf932e251a722635 Mon Sep 17 00:00:00 2001 From: Jerome Kelleher Date: Thu, 20 Jun 2024 13:14:34 +0100 Subject: [PATCH] Move requirements to conda, where possible --- .../CI-tests-conda/requirements.txt | 15 ++++++++++++++- .../requirements/CI-tests-pip/requirements.txt | 17 ++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/python/requirements/CI-tests-conda/requirements.txt b/python/requirements/CI-tests-conda/requirements.txt index 75641783c0..3357935e7a 100644 --- a/python/requirements/CI-tests-conda/requirements.txt +++ b/python/requirements/CI-tests-conda/requirements.txt @@ -1,2 +1,15 @@ -msprime==1.2.0 +biopython==1.79 h5py==3.11.0 +kastore==0.3.2 +lxml==4.9.2 +msgpack-python==1.0.4 +msprime==1.2.0 +networkx==3.1 +numba<=0.59.1 #Pinned directly as 0.60.0 fails +numpy==1.26.4 +portion==2.3.0 +pytest-cov==4.0.0 +pytest-xdist==2.5.0 +pytest==7.1.3 +svgwrite==1.4.3 +tszip==0.2.2 diff --git a/python/requirements/CI-tests-pip/requirements.txt b/python/requirements/CI-tests-pip/requirements.txt index 284a1ccfbd..f6f4d12ba3 100644 --- a/python/requirements/CI-tests-pip/requirements.txt +++ b/python/requirements/CI-tests-pip/requirements.txt @@ -1,17 +1,4 @@ -lshmm==0.0.5 -numpy==1.24.1 -pytest==7.1.3 -pytest-cov==4.0.0 -pytest-xdist==2.5.0 -svgwrite==1.4.3 -portion==2.3.0 -xmlunittest==0.5.0 -biopython==1.79 dendropy==4.5.2 -networkx==3.1 -msgpack==1.0.4 +lshmm==0.0.5 newick==1.3.2 -tszip==0.2.2 -kastore==0.3.2 -lxml==4.9.2 -numba<=0.59.1 #Pinned directly as 0.60.0 fails \ No newline at end of file +xmlunittest==0.5.0