From 084e4480b6e8877e00726e1b100d52f3f02d52b6 Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Tue, 22 Sep 2020 21:10:25 +1200 Subject: [PATCH 1/4] :arrow_up: Bump proj from 6.3.1 to 7.0.0 Bumps [proj](https://github.com/OSGeo/PROJ) from 6.3.1 to 7.0.0. - [Release notes](https://github.com/OSGeo/PROJ/releases) - [Changelog](https://github.com/OSGeo/PROJ/blob/master/NEWS) - [Commits](https://github.com/OSGeo/PROJ/compare/6.3.1...7.0.0) --- environment-linux-64.lock | 47 ++++++++++++++++++++++----------------- environment.yml | 2 +- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/environment-linux-64.lock b/environment-linux-64.lock index 2f728f9..f3c0368 100644 --- a/environment-linux-64.lock +++ b/environment-linux-64.lock @@ -22,6 +22,7 @@ https://conda.anaconda.org/conda-forge/linux-64/binutils_impl_linux-64-2.34-h212 https://conda.anaconda.org/conda-forge/linux-64/binutils_linux-64-2.34-h47ac705_27.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h24d8f2e_16.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/abseil-cpp-20200225.2-he1b5a44_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.4.57-he1b5a44_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-he1b5a44_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h516909a_3.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.16.1-h516909a_3.tar.bz2 @@ -36,7 +37,7 @@ https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h516909a_0.tar.bz https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-7.5.0-hdb87b24_16.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/geos-3.8.1-he1b5a44_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gflags-2.2.2-he1b5a44_1004.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/ghostscript-9.22-hf484d3e_1001.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/ghostscript-9.53.1-he1b5a44_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h516909a_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gmp-6.2.0-he1b5a44_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-he1b5a44_1001.tar.bz2 @@ -54,7 +55,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-0.10.0-he1b5a44_0.t https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.2-he1b5a44_3.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.2-he1b5a44_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/nettle-3.4.1-h1bed415_1002.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/nspr-4.28-he1b5a44_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/nspr-4.29-he1b5a44_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1g-h516909a_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/pcre-8.44-he1b5a44_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/perl-5.30.3-h516909a_1.tar.bz2 @@ -76,6 +77,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h14c3975_1007 https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.5-h516909a_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h516909a_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.11-h516909a_1009.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.9-h346380f_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.72.0-h8e57a91_0.tar.bz2 https://repo.anaconda.com/pkgs/main/linux-64/cudnn-7.6.5-cuda10.2_0.conda https://conda.anaconda.org/conda-forge/linux-64/gcc_linux-64-7.5.0-hf34d7eb_27.tar.bz2 @@ -108,6 +110,7 @@ https://conda.anaconda.org/rapidsai/linux-64/ucx-1.8.1+g6b29558-cuda10.2_0.tar.b https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.2-h8412b87_1004.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-h84519dc_1000.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/zstd-1.4.5-h6597ccf_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.1.6-h72b8ae1_3.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.2-he06d7ca_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/grpc-cpp-1.30.2-heedbac9_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gxx_linux-64-7.5.0-ha781d05_27.tar.bz2 @@ -118,44 +121,44 @@ https://conda.anaconda.org/conda-forge/linux-64/libclang-9.0.1-default_hde54327_ https://conda.anaconda.org/conda-forge/linux-64/libhwloc-2.1.0-h3c4fd83_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-hd79254b_1012.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.8.0-17_openblas.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.13.0-hbe8ec66_6.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.1.0-hc3755c2_3.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.33.0-h4cf870e_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/thrift-cpp-0.13.0-hbe8ec66_4.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.6.12-h516909a_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-4.3.1-h167e202_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.13.1-h86ecdb6_1001.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.11-hbd6801e_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.71.1-hcdd3856_5.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.71.1-hcdd3856_6.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libfaiss-1.6.3-he61ee18_1_cuda.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libpq-12.3-h5513abc_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.0.2-h56121f0_5.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/nss-3.56-he751ad9_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/nss-3.57-he751ad9_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.3.1-h981e76c_3.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/proj-6.3.1-hc80f0dc_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/python-3.8.3-cpython_he5300dc_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/thrift-compiler-0.13.0-hbe8ec66_6.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h516909a_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h516909a_1002.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.2.0-h516909a_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/attrs-20.2.0-pyh9f0ad1d_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.7.164-h69f4914_4.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/cachy-0.3.0-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/cfitsio-3.470-hce51eda_6.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/click-7.1.2-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/cloudpickle-1.6.0-py_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/curl-7.71.1-he644dc0_5.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/curl-7.71.1-he644dc0_6.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/fsspec-0.8.2-py_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.5.1-hcbe54f9_9.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/glib-2.66.0-h0dae87d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/idna-2.10-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/jeepney-0.4.3-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libgd-2.2.5-h307a58e_1007.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libspatialite-4.3.0a-heb269f5_1037.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/locket-0.2.0-py_2.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/lockfile-0.12.2-py_1.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/olefile-0.46-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/pastel-0.2.0-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/pkginfo-1.5.0.1-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/postgresql-12.3-h8573dbc_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/proj-7.0.0-h966b41f_5.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.6.0-py_1001.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/pycparser-2.20-pyh9f0ad1d_2.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/pylev-1.3.0-py_0.tar.bz2 @@ -166,27 +169,29 @@ https://conda.anaconda.org/conda-forge/noarch/shellingham-1.3.2-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/six-1.15.0-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.2.2-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/tblib-1.6.0-py_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/thrift-cpp-0.13.0-6.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/toolz-0.10.0-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/typing_extensions-3.7.4.2-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/wheel-0.35.1-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/zipp-3.1.0-py_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.7.164-hba45d7a_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-hcf35c78_1003.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/certifi-2020.6.20-py38h32f6830_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.1-py38h5bae8af_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/chardet-3.0.4-py38h32f6830_1006.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/cffi-1.14.3-py38h5bae8af_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/chardet-3.0.4-py38h32f6830_1007.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/clikit-0.4.3-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.10.1-py38h516909a_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/dbus-1.13.6-he372182_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/entrypoints-0.3-py38h32f6830_1001.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.0.0.post1-py38h1e0a361_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/fastrlock-0.5-py38h950e882_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.5.1-h05acad5_10.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.14.5-h36ae1b5_2.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/html5lib-1.1-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-1.7.0-py38h32f6830_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libdap4-3.20.6-h1d1bd15_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.7.4-nompi_h9f9fd6a_101.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libspatialite-4.3.0a-h2482549_1038.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/llvmlite-0.34.0-py38h4f45e52_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/markupsafe-1.1.1-py38h1e0a361_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.0-py38hbf85e49_1.tar.bz2 @@ -208,7 +213,7 @@ https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-0.17.1-py38h1234567_11 https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py38h1e0a361_1000.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/cleo-0.7.6-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/cryptography-3.1-py38h766eaa4_0.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/dask-core-2.26.0-py_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/dask-core-2.27.0-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gobject-introspection-1.64.1-py38h03d966d_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.14.5-h0935bb2_2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-2.4.0-h9f30f68_3.tar.bz2 @@ -216,17 +221,17 @@ https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-1.7.0-0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/pandas-1.1.2-py38h950e882_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/poppler-0.67.0-h14e79db_8.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/scipy-1.5.2-py38h8c5af15_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/setuptools-49.6.0-py38h32f6830_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/setuptools-49.6.0-py38h32f6830_1.tar.bz2 https://conda.anaconda.org/rapidsai/linux-64/ucx-py-0.15.0+g6b29558-py38_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.36.0-haf93ef1_1.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/cupy-7.8.0-py38hb1193b0_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/distributed-2.26.0-py38h32f6830_0.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.36.0-h516909a_2.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/cupy-7.8.0-py38hb1193b0_1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/distributed-2.27.0-py38h32f6830_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.38.2-h3f25603_4.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/jinja2-2.11.2-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/joblib-0.16.0-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/jsonschema-3.2.0-py38h32f6830_1.tar.bz2 https://conda.anaconda.org/rapidsai/linux-64/libcudf-0.15.0-cuda10.2_g71cb8c0e0_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.0.4-h94bbfbd_3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.0.4-h9e6407a_4.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/numba-0.51.2-py38hc5bc63f_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/pango-1.42.4-h7062337_4.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2 @@ -236,16 +241,16 @@ https://conda.anaconda.org/conda-forge/linux-64/qt-5.12.5-hd8c4c69_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/secretstorage-3.1.2-py38h32f6830_1.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/treelite-0.92-py38h4e709cc_2.tar.bz2 # no URL for: treelite_runtime-0.92-py3.8.egg-info -https://conda.anaconda.org/conda-forge/linux-64/atk-2.36.0-1.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/atk-2.36.0-2.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/bokeh-2.2.1-py38h32f6830_0.tar.bz2 -https://conda.anaconda.org/conda-forge/linux-64/gdal-3.0.4-py38h172510d_3.tar.bz2 +https://conda.anaconda.org/conda-forge/linux-64/gdal-3.0.4-py38h172510d_4.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/keyring-18.0.1-py38h32f6830_0.tar.bz2 https://conda.anaconda.org/rapidsai/linux-64/libcuspatial-0.15.0-cuda10.2_gc5b7527_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/pyarrow-0.17.1-py38h1234567_11_cuda.tar.bz2 https://conda.anaconda.org/rapidsai/linux-64/rmm-0.15.0-cuda_10.2_py38_g8005ca5_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/urllib3-1.25.10-py_0.tar.bz2 https://conda.anaconda.org/rapidsai/linux-64/cudf-0.15.0-cuda_10.2_py38_g71cb8c0e0_0.tar.bz2 -https://conda.anaconda.org/conda-forge/noarch/dask-2.26.0-py_0.tar.bz2 +https://conda.anaconda.org/conda-forge/noarch/dask-2.27.0-py_0.tar.bz2 https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.32-h586f36d_1.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/requests-2.24.0-pyh9f0ad1d_0.tar.bz2 https://conda.anaconda.org/conda-forge/noarch/cachecontrol-0.12.6-py_0.tar.bz2 diff --git a/environment.yml b/environment.yml index 7169300..09f6d1e 100644 --- a/environment.yml +++ b/environment.yml @@ -13,6 +13,6 @@ dependencies: - conda-forge::parallel=20200522[md5=8fa06db0afc1e7b1f136277557a4b65e] - conda-forge::pip=20.1.1[md5=5e42afe5672d5baf3d9d2260239aa923] - conda-forge::poetry=1.0.9[md5=8f0019c82ec6795bcc84fc711b1d72e4] - - conda-forge::proj=6.3.1[md5=dc4391dda7677c7299248d9754672526] + - conda-forge::proj=7.0.0[md5=6c84860aef0eeb9a547dbbb849e964fe] - conda-forge::python=3.8.3[md5=05f7e9adaf1f49dad884929ab0245ddc] - conda-forge::snappy=1.1.8[md5=83f1dc295c711bdbaf97e1f3bedf2f52] From 71e4bf9e5e59fd0c024b7aa005216da83ad2092b Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Tue, 22 Sep 2020 21:21:05 +1200 Subject: [PATCH 2/4] :arrow_up: Bump pyproj from 2.6.0 to 3.0.dev2 Bumps [pyproj](https://github.com/pyproj4/pyproj) from 2.6.0 to 3.0.dev2 - [Release notes](https://github.com/pyproj4/pyproj/releases) - [Changelog](https://github.com/pyproj4/pyproj/blob/master/docs/history.rst) - [Commits](https://github.com/pyproj4/pyproj/commits) --- poetry.lock | 39 +++++++++++++-------------------------- pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4656140..f995b06 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1593,8 +1593,11 @@ category = "main" description = "Python interface to PROJ (cartographic projections and coordinate transformations library)" name = "pyproj" optional = false -python-versions = ">=3.5" -version = "2.6.1.post1" +python-versions = ">=3.6" +version = "3.0.dev2" + +[package.dependencies] +certifi = "*" [[package]] category = "main" @@ -2063,7 +2066,7 @@ heapdict = "*" cuda = ["cupy-cuda102", "dask-cuda"] [metadata] -content-hash = "818e334eb7cc38dcc70dea25a8460086a4386564e46dd9f50b2af8a2caa9fe9e" +content-hash = "e6760a4e36e6cd39ed2dd20902bafd968f7684d508b5e21c484bd156409da26f" python-versions = "^3.8" [metadata.files] @@ -2965,29 +2968,12 @@ pyparsing = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] pyproj = [ - {file = "pyproj-2.6.1.post1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:457ad3856014ac26af1d86def6dc8cf69c1fa377b6e2fd6e97912d51cf66bdbe"}, - {file = "pyproj-2.6.1.post1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:6f3f36440ea61f5f6da4e6beb365dddcbe159815450001d9fb753545affa45ff"}, - {file = "pyproj-2.6.1.post1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:6a212d0e5c7efa33d039f0c8b0a489e2204fcd28b56206567852ad7f5f2a653e"}, - {file = "pyproj-2.6.1.post1-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:451a3d1c563b672458029ebc04acbb3266cd8b3025268eb871a9176dc3638911"}, - {file = "pyproj-2.6.1.post1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e015f900b4b84e908f8035ab16ebf02d67389c1c216c17a2196fc2e515c00762"}, - {file = "pyproj-2.6.1.post1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a13e5731b3a360ee7fbd1e9199ec9203fafcece8ebd0b1351f16d0a90cad6828"}, - {file = "pyproj-2.6.1.post1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:33c1c2968a4f4f87d517c4275a18b557e5c13907cf2609371fadea8463c3ba05"}, - {file = "pyproj-2.6.1.post1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:3fef83a01c1e86dd9fa99d8214f749837cfafc34d9d6230b4b0a998fa7a68a1a"}, - {file = "pyproj-2.6.1.post1-cp36-cp36m-win32.whl", hash = "sha256:a6ac4861979cd05a0f5400fefa41d26c0269a5fb8237618aef7c998907db39e1"}, - {file = "pyproj-2.6.1.post1-cp36-cp36m-win_amd64.whl", hash = "sha256:cbf6ccf990860b06c5262ff97c4b78e1d07883981635cd53a6aa438a68d92945"}, - {file = "pyproj-2.6.1.post1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:adacb67a9f71fb54ca1b887a6ab20f32dd536fcdf2acec84a19e25ad768f7965"}, - {file = "pyproj-2.6.1.post1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:e50d5d20b87758acf8f13f39a3b3eb21d5ef32339d2bc8cdeb8092416e0051df"}, - {file = "pyproj-2.6.1.post1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2518d1606e2229b82318e704b40290e02a2a52d77b40cdcb2978973d6fc27b20"}, - {file = "pyproj-2.6.1.post1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:33a5d1cfbb40a019422eb80709a0e270704390ecde7278fdc0b88f3647c56a39"}, - {file = "pyproj-2.6.1.post1-cp37-cp37m-win32.whl", hash = "sha256:daf2998e3f5bcdd579a18faf009f37f53538e9b7d0a252581a610297d31e8536"}, - {file = "pyproj-2.6.1.post1-cp37-cp37m-win_amd64.whl", hash = "sha256:a8b7c8accdc61dac8e91acab7c1f7b4590d1e102f2ee9b1f1e6399fad225958e"}, - {file = "pyproj-2.6.1.post1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9f097e8f341a162438918e908be86d105a28194ff6224633b2e9616c5031153f"}, - {file = "pyproj-2.6.1.post1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:d90a5d1fdd066b0e9b22409b0f5e81933469918fa04c2cf7f9a76ce84cb29dad"}, - {file = "pyproj-2.6.1.post1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:f5a8015c74ec8f6508aebf493b58ba20ccb4da8168bf05f0c2a37faccb518da9"}, - {file = "pyproj-2.6.1.post1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d87836be6b720fb4d9c112136aa47621b6ca09a554e645c1081561eb8e2fa1f4"}, - {file = "pyproj-2.6.1.post1-cp38-cp38-win32.whl", hash = "sha256:bc2f3a15d065e206d63edd2cc4739aa0a35c05338ee276ab1dc72f56f1944bda"}, - {file = "pyproj-2.6.1.post1-cp38-cp38-win_amd64.whl", hash = "sha256:93cbad7b699e8e80def7de80c350617f35e6a0b82862f8ce3c014657c25fdb3c"}, - {file = "pyproj-2.6.1.post1.tar.gz", hash = "sha256:4f5b02b4abbd41610397c635b275a8ee4a2b5bc72a75572b98ac6ae7befa471e"}, + {file = "pyproj-3.0.dev2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:7be2f8a05943e9668f81ada29c92781f3493bedd07216389d5ae868854e3c417"}, + {file = "pyproj-3.0.dev2-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:b84d830434aa51538e8b687647a43fc14e042dbd57aad046e31a376c4f89fbc5"}, + {file = "pyproj-3.0.dev2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6583aa037c07f08c4da94ec1f7d9453634a72b4c6cce04b91ffc63489300d38f"}, + {file = "pyproj-3.0.dev2-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e13989332045526eb6b631df963491ebbd1736027300f59fd5954120982a991f"}, + {file = "pyproj-3.0.dev2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f033a486ce68bb79b3e673f3fd6b3d9f1e76fca39bb12f017c5a5edac0ece1e5"}, + {file = "pyproj-3.0.dev2-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:90ec7a198361dd10de2f7116ec858d23ca355f16c20c8616e03c316ff68bc743"}, ] pyrsistent = [ {file = "pyrsistent-0.16.0.tar.gz", hash = "sha256:28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3"}, @@ -3211,6 +3197,7 @@ toml = [ {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, ] toolz = [ + {file = "toolz-0.10.0-py3-none-any.whl", hash = "sha256:e71d8d91c8902fb7659c23e10e9698a8c5cbea985683b8a378c6fd67b52f2fc4"}, {file = "toolz-0.10.0.tar.gz", hash = "sha256:08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"}, ] tornado = [ diff --git a/pyproject.toml b/pyproject.toml index 741cff4..c80eb0f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ pydap = "^3.2.2" pyepsg = "^0.4.0" pygmt = "^0.2.0" python = "^3.8" -pyproj = "^2.6.0" +pyproj = "^3.0.dev2" scikit-learn = "^0.23.2" toolz = "^0.10.0" tqdm = "^4.48.2" From 2f3abeda8f319e3b470bbec765fd0a17ac9ca6d1 Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Tue, 22 Sep 2020 22:13:01 +1200 Subject: [PATCH 3/4] :recycle: Improve lonlat_to_xy code and documentation Bumping pyproj from 2.6.0 to 3.0.0 allows us to get rid of the __array__ workaround added in be98dde1595c1fe2a6d0e241ab9b7ddf367d8532/#40. Also took the opportunity to improve the documentation of the function's input parameters and output results. --- deepicedrain/spatiotemporal.py | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/deepicedrain/spatiotemporal.py b/deepicedrain/spatiotemporal.py index bc7376f..8ce5b86 100644 --- a/deepicedrain/spatiotemporal.py +++ b/deepicedrain/spatiotemporal.py @@ -181,15 +181,30 @@ def lonlat_to_xy( """ Reprojects longitude/latitude EPSG:4326 coordinates to x/y coordinates. Default conversion is to Antarctic Stereographic Projection EPSG:3031. + + See also https://pyproj4.github.io/pyproj/latest/api/proj.html#pyproj-proj + + Parameters + ---------- + longitude : xr.DataArray or dask.dataframe.core.Series + Input longitude coordinate(s). + + latitude : xr.DataArray or dask.dataframe.core.Series + Input latitude coordinate(s). + + epsg : int + EPSG integer code for the desired output coordinate system. Default is + 3031 for Antarctic Polar Stereographic Projection. + + Returns + ------- + x : xr.DataArray or dask.dataframe.core.Series + The transformed x coordinate(s). + + y : xr.DataArray or dask.dataframe.core.Series + The transformed y coordinate(s). """ - if hasattr(longitude, "__array__") and callable(longitude.__array__): - # TODO upgrade to PyProj 3.0 to remove this workaround for passing in - # dask.dataframe.core.Series or xarray.DataArray objects - # Based on https://github.com/pyproj4/pyproj/pull/625 - _longitude = longitude.__array__() - _latitude = latitude.__array__() - - x, y = pyproj.Proj(projparams=epsg)(_longitude, _latitude) + x, y = pyproj.Proj(projparams=epsg)(longitude, latitude) if hasattr(longitude, "coords"): return ( From c3fffaf10d10a63082976d2c3b7e5ef342885145 Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Tue, 22 Sep 2020 22:58:29 +1200 Subject: [PATCH 4/4] :arrow_up: Bump fiona from 1.8.13.post1 to 1.8.17 Bumps [fiona](https://github.com/Toblerity/Fiona) from 1.8.13.post1 to 1.8.17. Fixes annoying "Unable to open EPSG support file gcs.csv" warning! - [Release notes](https://github.com/Toblerity/Fiona/releases) - [Changelog](https://github.com/Toblerity/Fiona/blob/1.8.17/CHANGES.txt) - [Commits](https://github.com/Toblerity/Fiona/compare/1.8.13.post1...1.8.17) --- poetry.lock | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/poetry.lock b/poetry.lock index f995b06..5e90573 100644 --- a/poetry.lock +++ b/poetry.lock @@ -542,7 +542,7 @@ description = "Fiona reads and writes spatial data files" name = "fiona" optional = false python-versions = "*" -version = "1.8.13.post1" +version = "1.8.17" [package.dependencies] attrs = ">=17" @@ -553,7 +553,7 @@ munch = "*" six = ">=1.7" [package.extras] -all = ["shapely", "boto3 (>=1.2.4)", "pytest (>=3)", "pytest-cov", "mock"] +all = ["pytest (>=3)", "boto3 (>=1.2.4)", "pytest-cov", "shapely", "mock"] calc = ["shapely"] s3 = ["boto3 (>=1.2.4)"] test = ["pytest (>=3)", "pytest-cov", "boto3 (>=1.2.4)", "mock"] @@ -2350,17 +2350,16 @@ fastrlock = [ {file = "fastrlock-0.5.tar.gz", hash = "sha256:9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f"}, ] fiona = [ - {file = "Fiona-1.8.13.post1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:6d6200a64f0f6fad431a767dd2da62706bf9f683be77bb157b6d0459bb263b7f"}, - {file = "Fiona-1.8.13.post1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:1c9c6e883e82298293042f7b7f51a5680f50d5a3bb1a61ad179b2d5f7f4d6952"}, - {file = "Fiona-1.8.13.post1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:781d29c21714da4c1c0f118b56bef936a1a935fead8878c22ab57a0d3875e412"}, - {file = "Fiona-1.8.13.post1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7598ed3ce7a88941a2eab5ffa90b39f8f44113355c39abcbda6920eecdba26b4"}, - {file = "Fiona-1.8.13.post1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3c236a8f9ddfc23ac746f4988526cbed73b43f8f86613a0001c62feb415daadc"}, - {file = "Fiona-1.8.13.post1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:b8ad562b77c76dbff5a9298e1032c87714f079fc80752ca7c9c85edef52039aa"}, - {file = "Fiona-1.8.13.post1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:923a64bded457adee795b4f926b8cbb87d58bbafaabded77bc1d47abb2bba5c6"}, - {file = "Fiona-1.8.13.post1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:79c3b80e00c9d055d20aead5d74319f54cdd1384e0d9e1a9e67446da2d74d89c"}, - {file = "Fiona-1.8.13.post1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c6e99bf596c2322e134833490611a612a8cce35a39c4c6499b7df919e24b482b"}, - {file = "Fiona-1.8.13.post1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6d30d755e9041a3380d85c1b2e09003f657c03a749fb02a3d36b191296f57f5d"}, - {file = "Fiona-1.8.13.post1.tar.gz", hash = "sha256:1a432bf9fd56f089256c010da009c90d4a795c531a848132c965052185336600"}, + {file = "Fiona-1.8.17-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:2563d9a9f21390a7376556c82d9cef90a20a362949a9c7cb66f4ce63d90b66cd"}, + {file = "Fiona-1.8.17-cp35-cp35m-macosx_10_9_intel.whl", hash = "sha256:5558d925d67f5b08d0bdb3d58f3611b2e9d4f070cb9b026bbdd52b6d487d5e03"}, + {file = "Fiona-1.8.17-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:fcfd8b67403de9b1cc53c045c72542e9f30cb15e617c89c41b928046a9b27daa"}, + {file = "Fiona-1.8.17-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4743fd04e3c1d88619e3c1e1266b826427c4e3fcf1286abbda8d3480028781bf"}, + {file = "Fiona-1.8.17-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:84131992cc664d531c93d1d4860c4b7ceac0516a2f31b9cd71823889c21fa67d"}, + {file = "Fiona-1.8.17-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d38a6ef59087b5a20ad7298608c5392e37705ff14d27b44435e04072bbf6632c"}, + {file = "Fiona-1.8.17-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:7f101957734898d2ad694be8d2bdd3f3e4f722387d3972c89dcedcae6b6c4bb7"}, + {file = "Fiona-1.8.17-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c9adb0c4245aec2d642727e027b79b862be4ffa13bdcc65b7ea5f9405cec492c"}, + {file = "Fiona-1.8.17-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cfeed61eb411ddc30f5048c43f3dfc0c03a97603dfa2bdc2ee16d5d063ff24b4"}, + {file = "Fiona-1.8.17.tar.gz", hash = "sha256:716201c21246587f374785bec6d6a20a984fe1f6c2b0e83bf15127eb8f724d0c"}, ] fsspec = [ {file = "fsspec-0.7.4-py3-none-any.whl", hash = "sha256:1f9391c9b6e92a89949f0b0f7154b8b62a01f00b9c2767797d94ffa376dae9ab"}, @@ -3197,7 +3196,6 @@ toml = [ {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, ] toolz = [ - {file = "toolz-0.10.0-py3-none-any.whl", hash = "sha256:e71d8d91c8902fb7659c23e10e9698a8c5cbea985683b8a378c6fd67b52f2fc4"}, {file = "toolz-0.10.0.tar.gz", hash = "sha256:08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"}, ] tornado = [