From 8e7b01edfa83bc8398f132138e7c5fdab5888f6f Mon Sep 17 00:00:00 2001 From: Aaron Pulver Date: Sun, 26 Dec 2021 21:49:00 -0500 Subject: [PATCH 1/2] do not require geopandas to be installed since allagash doesn't directly import it.Bump min Python version. --- src/allagash/__init__.py | 2 +- src/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allagash/__init__.py b/src/allagash/__init__.py index c729e88..a1a15bf 100644 --- a/src/allagash/__init__.py +++ b/src/allagash/__init__.py @@ -1,4 +1,4 @@ from .problem import Problem, UnboundedException, UndefinedException, InfeasibleException, NotSolvedException from .coverage import Coverage -__version__ = "0.2.3" +__version__ = "0.3.0" diff --git a/src/setup.py b/src/setup.py index 635a847..29f192d 100644 --- a/src/setup.py +++ b/src/setup.py @@ -29,8 +29,8 @@ def find_version(*file_paths): url='https://github.com/apulverizer/allagash', packages=['allagash'], license='MIT', + python_requires='>=3.6', install_requires=[ - 'geopandas>=0.4.1', 'pandas>=0.23.0', 'pulp>=1.6.1' ], From 157c353870abc743ae2d4c4a4dd00fef1dabf0aa Mon Sep 17 00:00:00 2001 From: Aaron Pulver Date: Mon, 27 Dec 2021 14:16:19 -0500 Subject: [PATCH 2/2] add geopandas and arcgis as extra_require --- src/setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/setup.py b/src/setup.py index 29f192d..161c8a2 100644 --- a/src/setup.py +++ b/src/setup.py @@ -34,6 +34,10 @@ def find_version(*file_paths): 'pandas>=0.23.0', 'pulp>=1.6.1' ], + extras_require={ + "arcgis": ["arcgis>=1.8.2"], + "geopandas": ["geopandas>=0.4.1"] + }, classifiers=[ 'Intended Audience :: Science/Research', 'Programming Language :: Python :: 3'