From c0ec8c3a20779918a13be68b5722653da9e83eb1 Mon Sep 17 00:00:00 2001 From: Michael Fitzmaurice Date: Fri, 8 Apr 2022 13:25:57 +0100 Subject: [PATCH 1/3] Loosen version constraints for various pytest-related dependencies --- requirements.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9d678b7e..d11a42e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ decorator==4.4.2 descartes==1.1.0 dictdiffer==0.8.1 docutils==0.15.2 +Fiona==1.8.20 flake8>=3.8.4 future==0.18.2 geopandas==0.9.0 @@ -56,10 +57,10 @@ Pyomo==5.7.3 Pygments==2.7.4 pyparsing==2.4.7 pyproj>=3.1.0 -pytest==6.2.5 -pytest-cov==2.12.1 -pytest-mock==3.1.0 -pytest-xdist==2.3.0 +pytest>=6.0.0 +pytest-cov>=2.0.0 +pytest-mock>=3.0.0 +pytest-xdist>=2.0.0 python-dateutil==2.8.1 pytz==2020.1 PyUtilib>=5.8.0 From 8de16850a595be8ba0fc933688c2975934b56d67 Mon Sep 17 00:00:00 2001 From: Michael Fitzmaurice Date: Fri, 8 Apr 2022 13:59:37 +0100 Subject: [PATCH 2/3] Remove fiona from the dependencies --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d11a42e5..159ad955 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,6 @@ decorator==4.4.2 descartes==1.1.0 dictdiffer==0.8.1 docutils==0.15.2 -Fiona==1.8.20 flake8>=3.8.4 future==0.18.2 geopandas==0.9.0 From 1110bdd5bee6326b9b1615de2ab31263815ac136 Mon Sep 17 00:00:00 2001 From: Michael Fitzmaurice Date: Fri, 8 Apr 2022 14:01:44 +0100 Subject: [PATCH 3/3] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a1f7718e..e786ec9c 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name="genet", - version="0.0.1", + version="1.0.1", author="Kasia Kozlowska", author_email="", description="MATSim network scenario generator",