Merge pull request #83 from jGaboardi/vbump

Version bump prep
jGaboardi · Jul 8, 2021 · c49e756 · c49e756
2 parents a84c2d0 + 794eb31
commit c49e756
Show file tree

Hide file tree

Showing 13 changed files with 217 additions and 244 deletions.
diff --git a/environment.yml b/environment.yml
@@ -14,6 +14,7 @@
    - pandas
    - pip
    - pre-commit
+   - pygeos>=0.8.0
    - scipy
    - shapely>=1.7.1
    - watermark

diff --git a/examples/empirical_network_example.ipynb b/examples/empirical_network_example.ipynb
diff --git a/examples/synthetic_network_example.ipynb b/examples/synthetic_network_example.ipynb
diff --git a/requirements_conda.txt b/requirements_conda.txt
@@ -1,7 +1,6 @@
 black
 gdal>=3.3.0
 geopandas>=0.9.0
-libgdal>=3.3.0
 libpysal
 numpy
 pandas

diff --git a/requirements_conda_only.txt b/requirements_conda_only.txt
@@ -0,0 +1 @@
+libgdal>=3.3.0
diff --git a/tigernet/__init__.py b/tigernet/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 
 """
 `tigernet` --- "Network Topology via TIGER/Line Shapefiles"

diff --git a/tigernet/tests/test_data_generation.py b/tigernet/tests/test_data_generation.py
@@ -17,6 +17,8 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
 
 
 class TestNetworkDataGenerationCreation(unittest.TestCase):

diff --git a/tigernet/tests/test_kdtree.py b/tigernet/tests/test_kdtree.py
@@ -17,6 +17,8 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
 
 
 class TestKDTreeLattice1x1(unittest.TestCase):

diff --git a/tigernet/tests/test_obs2obs_empirical.py b/tigernet/tests/test_obs2obs_empirical.py
@@ -17,6 +17,8 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
 
 
 ####################################################################################

diff --git a/tigernet/tests/test_observations_empirical.py b/tigernet/tests/test_observations_empirical.py
@@ -17,6 +17,9 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
+
 
 ####################################################################################
 ################################## EMPIR-EMPIR #####################################

diff --git a/tigernet/tests/test_observations_synthetic.py b/tigernet/tests/test_observations_synthetic.py
@@ -18,6 +18,8 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
 
 
 ####################################################################################

diff --git a/tigernet/tests/test_stats.py b/tigernet/tests/test_stats.py
@@ -21,6 +21,9 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
+
 
 ##########################################################################################
 # Synthetic testing

diff --git a/tigernet/tests/test_tigernet_empirical_gdf.py b/tigernet/tests/test_tigernet_empirical_gdf.py
@@ -19,6 +19,8 @@
 else:
     WINDOWS = False
     DECIMAL = 1
+# WINDOWS = False
+# DECIMAL = 1
 
 
 class TestNetworkBuildEmpiricalGDF(unittest.TestCase):