Update dependencies

Author: Jesus89

Makefile

@@ -1,5 +1,5 @@
 init:
-	pip install -e .
+	pip install -e .[tests]
 
 test:
 	pytest tests/unit/

setup.py

@@ -26,10 +26,10 @@ def get_version():
 REQUIRES = [
     'appdirs>=1.4.3,<2.0',
     'carto>=1.11.3,<2.0',
+    'markupsafe<=2.0.1',
     'jinja2>=2.10.1,<3.0',
-    'numpy<=1.22.4',
     'pandas>=0.25.0',
-    'shapely>=1.7,<=1.7.1',
+    'shapely>=1.7,<2.0',
     'geopandas>=0.6.0,<1.0',
     'unidecode>=1.1.0,<2.0',
     'semantic_version>=2.8.0,<3'

tests/unit/io/test_carto.py

@@ -5,7 +5,6 @@
 from pandas import Index
 from geopandas import GeoDataFrame
 from shapely.geometry import Point
-from shapely.geometry.base import BaseGeometry
 from shapely import wkt
 
 from carto.exceptions import CartoException
@@ -83,17 +82,18 @@ def test_read_carto_basegeometry_as_null_geom_value(mocker):
     })
 
     # When
-    gdf = read_carto('__source__', CREDENTIALS, null_geom_value=BaseGeometry())
+    gdf = read_carto('__source__', CREDENTIALS, null_geom_value=None)
 
     # Then
     expected = GeoDataFrame({
         'cartodb_id': [1],
         'the_geom': [
-            BaseGeometry()
+            None
         ]
     }, geometry='the_geom')
 
     cm_mock.assert_called_once_with('__source__', None, None, 3)
+    print(expected, gdf)
     assert expected.equals(gdf)
     assert gdf.crs == 'epsg:4326'
 

tox.ini

@@ -10,7 +10,6 @@ python =
 
 [testenv]
 deps =
-    markupsafe<=2.0.1
     flake8
     pytest
     pytest-mock
@@ -21,7 +20,6 @@ commands =
 
 [testenv:unit]
 deps =
-    markupsafe<=2.0.1
     flake8
     pytest
     pytest-mock
@@ -32,7 +30,6 @@ commands =
 
 [testenv:e2e]
 deps =
-    markupsafe<=2.0.1
     flake8
     pytest
 commands =
@@ -42,7 +39,6 @@ commands =
 
 [testenv:cov]
 deps =
-    markupsafe<=2.0.1
     pytest
     pytest-mock
     pytest-cov
@@ -52,7 +48,6 @@ commands =
 
 [testenv:cov-html]
 deps =
-    markupsafe<=2.0.1
     pytest
     pytest-mock
     pytest-cov