Skip to content

Commit

Permalink
Updating master branch (#185)
Browse files Browse the repository at this point in the history
* Create pythonpublish.yml

* updated to 0.1.0 including pip support

* Create .pypirc

* removed token

* corrected file name

* removed GDAL dep

* updated file content

* corrected folder name

* version 0.1.1, now REALLY with pip and github actions

* updated pypi installation instruction

* added quantiles

* added sanity checks

* writing geojson instead shp

* Bump pip from 20.0.2 to 21.1

Bumps [pip](https://github.com/pypa/pip) from 20.0.2 to 21.1.
- [Release notes](https://github.com/pypa/pip/releases)
- [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst)
- [Commits](pypa/pip@20.0.2...21.1)

---
updated-dependencies:
- dependency-name: pip
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump ipython from 7.13.0 to 7.16.3 in /docs

Bumps [ipython](https://github.com/ipython/ipython) from 7.13.0 to 7.16.3.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@7.13.0...7.16.3)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump ipython from 7.13.0 to 7.16.3

Bumps [ipython](https://github.com/ipython/ipython) from 7.13.0 to 7.16.3.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@7.13.0...7.16.3)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump numpy from 1.18.1 to 1.21.0

Bumps [numpy](https://github.com/numpy/numpy) from 1.18.1 to 1.21.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](numpy/numpy@v1.18.1...v1.21.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump numpy from 1.18.1 to 1.21.0 in /docs

Bumps [numpy](https://github.com/numpy/numpy) from 1.18.1 to 1.21.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](numpy/numpy@v1.18.1...v1.21.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump numpy from 1.21.0 to 1.22.0 in /docs (#150)

Bumps [numpy](https://github.com/numpy/numpy) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst)
- [Commits](numpy/numpy@v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump numpy from 1.21.0 to 1.22.0 (#151)

Bumps [numpy](https://github.com/numpy/numpy) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst)
- [Commits](numpy/numpy@v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nbconvert from 5.6.1 to 6.3.0 (#153)

Bumps [nbconvert](https://github.com/jupyter/nbconvert) from 5.6.1 to 6.3.0.
- [Release notes](https://github.com/jupyter/nbconvert/releases)
- [Commits](jupyter/nbconvert@5.6.1...6.3.0)

---
updated-dependencies:
- dependency-name: nbconvert
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nbconvert from 5.6.1 to 6.3.0 in /docs (#152)

Bumps [nbconvert](https://github.com/jupyter/nbconvert) from 5.6.1 to 6.3.0.
- [Release notes](https://github.com/jupyter/nbconvert/releases)
- [Commits](jupyter/nbconvert@5.6.1...6.3.0)

---
updated-dependencies:
- dependency-name: nbconvert
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump setuptools from 49.6 to 65.5.1 in /docs (#158)

Bumps [setuptools](https://github.com/pypa/setuptools) from 49.6 to 65.5.1.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](pypa/setuptools@v49.6.0...v65.5.1)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nbconvert from 6.3.0 to 6.5.1 (#154)

Bumps [nbconvert](https://github.com/jupyter/nbconvert) from 6.3.0 to 6.5.1.
- [Release notes](https://github.com/jupyter/nbconvert/releases)
- [Commits](jupyter/nbconvert@6.3.0...6.5.1)

---
updated-dependencies:
- dependency-name: nbconvert
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nbconvert from 6.3.0 to 6.5.1 in /docs (#155)

Bumps [nbconvert](https://github.com/jupyter/nbconvert) from 6.3.0 to 6.5.1.
- [Release notes](https://github.com/jupyter/nbconvert/releases)
- [Commits](jupyter/nbconvert@6.3.0...6.5.1)

---
updated-dependencies:
- dependency-name: nbconvert
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump wheel from 0.33.6 to 0.38.1 in /docs (#156)

Bumps [wheel](https://github.com/pypa/wheel) from 0.33.6 to 0.38.1.
- [Release notes](https://github.com/pypa/wheel/releases)
- [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst)
- [Commits](pypa/wheel@0.33.6...0.38.1)

---
updated-dependencies:
- dependency-name: wheel
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump setuptools from 49.6 to 65.5.1 (#157)

Bumps [setuptools](https://github.com/pypa/setuptools) from 49.6 to 65.5.1.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](pypa/setuptools@v49.6.0...v65.5.1)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ipython from 7.16.3 to 8.10.0 in /docs (#159)

Bumps [ipython](https://github.com/ipython/ipython) from 7.16.3 to 8.10.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@7.16.3...8.10.0)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ipython from 7.16.3 to 8.10.0 (#160)

Bumps [ipython](https://github.com/ipython/ipython) from 7.16.3 to 8.10.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](ipython/ipython@7.16.3...8.10.0)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* updated dependencies (#161)

* v0.1.2 (#162)

* updated dependencies

* correct dtype of list with selection conflict type

* got rid of fiona requirement

* improved downloading of example data

* deprecated plotting for now

as sklearn API has changed

* v0.1.2

* Bump pip from 21.1 to 23.3 (#183)

Bumps [pip](https://github.com/pypa/pip) from 21.1 to 23.3.
- [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst)
- [Commits](pypa/pip@21.1...23.3)

---
updated-dependencies:
- dependency-name: pip
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jinja2 from 2.11.3 to 3.1.3 in /docs (#184)

Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.3 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@2.11.3...3.1.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
JannisHoch and dependabot[bot] authored Jan 12, 2024
1 parent bd6dcf4 commit 24f403e
Show file tree
Hide file tree
Showing 15 changed files with 126 additions and 66 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# content copied from https://github.com/actions/starter-workflows/blob/main/ci/python-publish.yml

name: Upload Python Package

on:
release:
types: [published]

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"restructuredtext.confPath": "${workspaceFolder}\\docs",
"python.pythonPath": "C:\\Users\\Icke\\anaconda3\\envs\\conflict_model\\python.exe"
"python.pythonPath": "C:\\Users\\hoch0001\\AppData\\Local\\Continuum\\anaconda3\\envs\\copro\\python.exe"
}
2 changes: 1 addition & 1 deletion copro/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

__author__ = """Jannis M. Hoch, Sophie de Bruin, Niko Wanders"""
__email__ = '[email protected]'
__version__ = '0.0.8'
__version__ = '0.1.2'
2 changes: 1 addition & 1 deletion copro/conflict.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def conflict_in_previous_year(config, conflict_gdf, extent_gdf, sim_year, check_

# merge the dataframes with polygons and conflict information, creating a sub-set of polygons/regions
data_merged = gpd.sjoin(temp_sel_year, extent_gdf)

conflicts_per_poly = data_merged.id.groupby(data_merged['watprovID']).count().to_frame().rename(columns={"id": 'conflict_count'})

# loop through all polygons and check if exists in sub-set
Expand Down
7 changes: 7 additions & 0 deletions copro/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,13 @@ def plot_ROC_curve_n_times(ax, clf, X_test, y_test, tprs, aucs, mean_fpr, **kwar
list: lists with true positive rates and area-under-curve values per plot.
"""

raise DeprecationWarning('Plotting API in sklearn is changed, function needs updating.')

viz = metrics.plot_roc_curve(clf, X_test, y_test, ax=ax,
alpha=0.15, color='b', lw=1, label=None, **kwargs)

# rfc_disp = metrics.RocCurveDisplay.from_estimator(clf, X_test, y_test, ax=ax,
# alpha=0.15, color='b', lw=1, label=None, **kwargs)

interp_tpr = np.interp(mean_fpr, viz.fpr, viz.tpr)
interp_tpr[0] = 0.0
Expand All @@ -121,6 +126,8 @@ def plot_ROC_curve_n_mean(ax, tprs, aucs, mean_fpr, **kwargs):
mean_fpr (array): array with mean false positive rate.
"""

raise DeprecationWarning('Plotting API in sklearn is changed, function needs updating.')

mean_tpr = np.mean(tprs, axis=0)
mean_tpr[-1] = 1.0
mean_auc = metrics.auc(mean_fpr, mean_tpr)
Expand Down
20 changes: 11 additions & 9 deletions copro/scripts/copro_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,18 @@ def cli(cfg, make_plots=True, verbose=False):
out_y_df = copro.evaluation.fill_out_df(out_y_df, y_df)
out_dict = copro.evaluation.fill_out_dict(out_dict, eval_dict)

## NOTE 15-Mar-2023: ROC plotting has been changed in sklearn, needs updating
#- plot ROC curve per model execution
tprs, aucs = copro.plots.plot_ROC_curve_n_times(ax1, clf, X_df.to_numpy(), y_df.y_test.to_list(),
trps, aucs, mean_fpr)

#- plot mean ROC curve
copro.plots.plot_ROC_curve_n_mean(ax1, tprs, aucs, mean_fpr)
#- save plot
plt.savefig(os.path.join(out_dir_REF, 'ROC_curve_per_run.png'), dpi=300, bbox_inches='tight')
#- save data for plot
copro.evaluation.save_out_ROC_curve(tprs, aucs, out_dir_REF)
# tprs, aucs = copro.plots.plot_ROC_curve_n_times(ax1, clf, X_df.to_numpy(), y_df.y_test.to_list(),
# trps, aucs, mean_fpr)

## NOTE 15-Mar-2023: ROC plotting has been changed in sklearn, needs updating
# #- plot mean ROC curve
# copro.plots.plot_ROC_curve_n_mean(ax1, tprs, aucs, mean_fpr)
# #- save plot
# plt.savefig(os.path.join(out_dir_REF, 'ROC_curve_per_run.png'), dpi=300, bbox_inches='tight')
# #- save data for plot
# copro.evaluation.save_out_ROC_curve(tprs, aucs, out_dir_REF)

#- save output dictionary to csv-file
copro.utils.save_to_csv(out_dict, out_dir_REF, 'evaluation_metrics')
Expand Down
24 changes: 17 additions & 7 deletions copro/scripts/postprocessing/plot_value_over_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def main(input_dir=None, statistics=None, polygon_id=None, column=None, title=No
"""Quick and dirty function to plot the develoment of a column in the outputted geojson-files over time.
The script uses all geoJSON-files located in input-dir and retrieves values from them.
Possible to plot obtain development for multiple polygons (indicated via their ID) or entire study area.
If the latter, then different statistics can be chosen (mean, max, min, std).
If the latter, then different statistics can be chosen (mean, max, min, std, median, 'q05', 'q10', 'q90', 'q95').
Args:
input-dir (str): path to input directory with geoJSON-files located per projection year.
Expand All @@ -44,18 +44,23 @@ def main(input_dir=None, statistics=None, polygon_id=None, column=None, title=No
polygon_id = 'all'
click.echo('INFO: selected statistcal method is {}'.format(statistics))
# create a suffix to be used for output files
suffix = '_all_{}'.format(statistics)
suffix = 'all_{}'.format(statistics)
# check if supported statistical function is selected
if statistics not in ['mean', 'max', 'min', 'std', 'median', 'q05', 'q10', 'q90', 'q95']:
raise ValueError('ERROR: {} is not a supported statistical method'.format(statistics))

else:
click.echo('INFO: sampling from IDs'.format(polygon_id))
# for IDs, no statistical function can be applied as it's only one value...
if statistics != None:
raise Warning('WARNING: if one or more IDs are provided, the statistical function is neglected.')

# absolute path to input_dir
input_dir = os.path.abspath(input_dir)
click.echo('INFO: getting geojson-files from {}'.format(input_dir))

# collect all files in input_dir
all_files = glob.glob(os.path.join(input_dir, '*.geojson'))

if verbose:
if polygon_id != 'all':
click.echo('DEBUG: sampling from IDs'.format(polygon_id))
all_files = glob.glob(os.path.join(input_dir, '*.geojson'))

# create dictionary with list for areas (either IDs or entire study area) to be sampled from
out_dict = dict()
Expand Down Expand Up @@ -103,9 +108,14 @@ def main(input_dir=None, statistics=None, polygon_id=None, column=None, title=No
else:
# compute mean value over column
if statistics == 'mean': vals = df[column].mean()
if statistics == 'median': vals = df[column].median()
if statistics == 'max': vals = df[column].max()
if statistics == 'min': vals = df[column].min()
if statistics == 'std': vals = df[column].std()
if statistics == 'q05': vals = df[column].quantile(.05)
if statistics == 'q10': vals = df[column].quantile(.1)
if statistics == 'q90': vals = df[column].quantile(.9)
if statistics == 'q95': vals = df[column].quantile(.95)
# append this value to list in dict
idx_list = out_dict[polygon_id]
idx_list.append(vals)
Expand Down
6 changes: 3 additions & 3 deletions copro/selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def filter_conflict_properties(gdf, config):
pass
else:
if config.getboolean('general', 'verbose'): print('DEBUG: filtering key', key, 'with value(s)', selection_criteria[key])
selection_criteria[key] = [eval(i) for i in selection_criteria[key]]
gdf = gdf[gdf[key].isin(selection_criteria[key])]

return gdf
Expand Down Expand Up @@ -184,8 +185,7 @@ def select(config, out_dir, root_dir):
global_df = utils.global_ID_geom_info(polygon_gdf)

# save conflict data and polygon to shp-file
# TODO: save as geoJSON rather than shp
gdf.to_file(os.path.join(out_dir, 'selected_conflicts.shp'), crs='EPSG:4326')
polygon_gdf.to_file(os.path.join(out_dir, 'selected_polygons.shp'), crs='EPSG:4326')
gdf.to_file(os.path.join(out_dir, 'selected_conflicts.geojson'), driver='GeoJSON', crs='EPSG:4326')
polygon_gdf.to_file(os.path.join(out_dir, 'selected_polygons.geojson'), driver='GeoJSON', crs='EPSG:4326')

return gdf, polygon_gdf, global_df
6 changes: 4 additions & 2 deletions docs/Installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ To install CoPro in editable mode in this environment, run this command next in
From PyPI
------------

.. todo::
To install CoPro directly from PyPI, use the following command.

.. code-block:: console
This is not yet supported. Feel invited to provide a pull request enabling installation via PyPI.
pip install copro
From conda
------------
Expand Down
12 changes: 6 additions & 6 deletions docs/requirements.rtd.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pip>=19.2.3
bump2version==0.5.11
wheel==0.33.6
wheel==0.38.1
watchdog==0.9.0
flake8==3.7.8
tox==3.14.0
Expand All @@ -12,14 +12,14 @@ pytest-runner==5.1
click==7.1.1
geopandas==0.7.0
matplotlib==3.2.1
numpy==1.18.1
numpy==1.22.0
pandas==1.0.3
rasterio==1.1.3
rioxarray==0.0.26
xarray==0.15.0
ipython==7.13.0
ipython==8.10.0
notebook>=6.1.5
nbconvert==5.6.1
nbconvert==6.5.1
netCDF4==1.5.3
scikit-learn==0.22.1
descartes==1.1.0
Expand All @@ -28,6 +28,6 @@ git+https://github.com/pandas-dev/pydata-sphinx-theme.git@master
rasterstats==0.14.0
seaborn==0.10.1
nbsphinx==0.8.5
jinja2==2.11.3
jinja2==3.1.3
nbsphinx_link==1.3.0
setuptools==49.6
setuptools==65.5.1
22 changes: 10 additions & 12 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ channels:
- conda-forge

dependencies:
- python>=3.6
- xarray==0.15.1
- pandas==1.0.3
- numpy==1.18.1
- matplotlib==3.2.1
- python>=3.9
- xarray>=0.15.1
- pandas>=1.0.3
- numpy>=1.18.1
- matplotlib>=3.2.1
- rtree>=0.9.4
- pytest>=5.4.2
- pytest-runner
Expand All @@ -17,7 +17,7 @@ dependencies:
- ipython
- notebook
- nbconvert
- ipykernel==5.3.2
- ipykernel>=5.3.2
- scikit-learn>=0.23.2
- netcdf4
- ConfigParser
Expand All @@ -27,9 +27,7 @@ dependencies:
- colorama
- setuptools>=49.6
- pillow==8.1.0
- pip:
- geopandas==0.8.0
- rasterio==1.1.0
- fiona
- rasterstats==0.14.0

- geopandas>=0.8.0
- rasterio>=1.1.0
- rasterstats>=0.14.0

8 changes: 4 additions & 4 deletions example/_scripts/download_example_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

echo download zip-file
# for WIN
curl https://zenodo.org/record/4617719/files/example_data.zip -o example_data.zip
#curl https://zenodo.org/record/4617719/files/example_data.zip -o example_data.zip
# for UNIX
wget curl https://zenodo.org/record/4617719/files/example_data.zip
wget https://zenodo.org/record/4617719/files/example_data.zip

echo unzip data
unzip example_data.zip -d example_data

echo copy data
cp example_data ../example_data
mv example_data/example_data ../example_data

echo remove zip-file
rm example_data.zip
rm -r example_data*
10 changes: 5 additions & 5 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
pip==20.0.2
pip==23.3
click==7.1.2
configparser==5.0.0
descartes==1.1.0
geopandas==0.8.0
ipython==7.13.0
ipython==8.10.0
matplotlib==3.2.1
nbconvert==5.6.1
nbconvert==6.5.1
netcdf4==1.5.3
notebook>=6.1.5
numpy==1.18.1
numpy==1.22.0
pandas==1.0.3
pyproj==2.6.0
pytest==5.4.2
Expand All @@ -23,4 +23,4 @@ tox==3.14.0
coverage==4.5.4
rasterstats==0.14
seaborn==0.10.1
setuptools==49.6
setuptools==65.5.1
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.0.8
current_version = 0.1.2
commit = True
tag = True

Expand Down
Loading

0 comments on commit 24f403e

Please sign in to comment.