From 47e0fb7271cfc518f9cb585cce4da3a6fe1340f9 Mon Sep 17 00:00:00 2001 From: Benjamin K <53038537+treee111@users.noreply.github.com> Date: Mon, 26 Sep 2022 20:18:00 +0200 Subject: [PATCH] [DEV] install: Update python packages to latest minor release and delete unused environment files (#148) * update dev-packages to latest minor release and patch level update existing environment via: conda env update --file conda_env/gdal-dev.yml * Pin used python package versiosn in Github Actions to the ones in conda_env/gdal-dev.yml * delete unused files - environment-... .yml was used as export of all installed python packages in the environment per OS - requirements.txt was used to install packages via pip (legacy) * update package to latest minor release and patch level (PyPI installation) --- .github/workflows/tests.yml | 4 +- conda_env/environment-mac.yml | 124 ---------------------------------- conda_env/environment-win.yml | 112 ------------------------------ conda_env/gdal-dev.yml | 6 +- conda_env/requirements.txt | Bin 1052 -> 0 bytes setup.cfg | 2 +- 6 files changed, 6 insertions(+), 242 deletions(-) delete mode 100644 conda_env/environment-mac.yml delete mode 100644 conda_env/environment-win.yml delete mode 100644 conda_env/requirements.txt diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 79463254..4c55841c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,9 +20,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install pylint + pip install pylint==2.15.* pip install mock - pip install requests + pip install requests==2.28.* - name: Analysing the code with pylint run: | pylint -j 0 ./wahoomc ./tests diff --git a/conda_env/environment-mac.yml b/conda_env/environment-mac.yml deleted file mode 100644 index db0484dd..00000000 --- a/conda_env/environment-mac.yml +++ /dev/null @@ -1,124 +0,0 @@ -name: gdal-dev -channels: - - conda-forge - - defaults -dependencies: - - astroid=2.9.3=py37hf985489_0 - - autopep8=1.6.0=pyhd8ed1ab_1 - - blosc=1.21.0=he49afe7_0 - - boost-cpp=1.74.0=hdbf7018_7 - - brotlipy=0.7.0=py37h69ee0a8_1004 - - bzip2=1.0.8=h0d85af4_4 - - c-ares=1.18.1=h0d85af4_0 - - ca-certificates=2021.10.8=h033912b_0 - - cairo=1.16.0=h9e0e54b_1010 - - certifi=2021.10.8=py37hf985489_2 - - cffi=1.15.0=py37h446072c_0 - - cfitsio=4.1.0=h2c97ad1_0 - - charset-normalizer=2.0.12=pyhd8ed1ab_0 - - colorama=0.4.4=pyh9f0ad1d_0 - - cryptography=36.0.2=py37h20b3391_1 - - curl=7.82.0=h9f20792_0 - - expat=2.4.8=h96cf925_0 - - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - - font-ttf-inconsolata=3.000=h77eed37_0 - - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 - - fontconfig=2.14.0=h676cef8_0 - - fonts-conda-ecosystem=1=0 - - fonts-conda-forge=1=0 - - freetype=2.10.4=h4cff582_1 - - freexl=1.0.6=h0d85af4_0 - - gdal=3.4.2=py37h80afb9d_4 - - geojson=2.5.0=py_0 - - geos=3.10.2=he49afe7_0 - - geotiff=1.7.1=had63758_1 - - gettext=0.19.8.1=hd1a6beb_1008 - - giflib=5.2.1=hbcb3906_2 - - hdf4=4.2.15=hefd3b78_3 - - hdf5=1.12.1=nompi_ha60fbc9_104 - - icu=69.1=he49afe7_0 - - idna=3.3=pyhd8ed1ab_0 - - isort=5.10.1=pyhd8ed1ab_0 - - jbig=2.1=h0d85af4_2003 - - jpeg=9e=h0d85af4_0 - - json-c=0.15=hcb556a6_0 - - kealib=1.4.14=ha22a8b1_3 - - krb5=1.19.3=hb49756b_0 - - lazy-object-proxy=1.7.1=py37h69ee0a8_1 - - lcms2=2.12=h577c468_0 - - lerc=3.0=he49afe7_0 - - libblas=3.9.0=14_osx64_openblas - - libcblas=3.9.0=14_osx64_openblas - - libcurl=7.82.0=h9f20792_0 - - libcxx=13.0.1=hc203e6f_0 - - libdap4=3.20.6=h3e144a0_2 - - libdeflate=1.10=h0d85af4_0 - - libedit=3.1.20191231=h0678c8f_2 - - libev=4.33=haf1e3a3_1 - - libffi=3.4.2=h0d85af4_5 - - libgdal=3.4.2=hc7881c0_4 - - libgfortran=5.0.0=9_3_0_h6c81a4c_23 - - libgfortran5=9.3.0=h6c81a4c_23 - - libglib=2.70.2=hf1fb8c0_4 - - libiconv=1.16=haf1e3a3_0 - - libkml=1.3.0=h8fd9edb_1014 - - liblapack=3.9.0=14_osx64_openblas - - libnetcdf=4.8.1=nompi_h6609ca0_101 - - libnghttp2=1.47.0=h942079c_0 - - libopenblas=0.3.20=openmp_hb3cd9ec_0 - - libpng=1.6.37=h7cec526_2 - - libpq=14.2=hea3049e_0 - - librttopo=1.1.0=hec60dd8_9 - - libspatialite=5.0.1=hadde3e2_15 - - libssh2=1.10.0=h52ee1ee_2 - - libtiff=4.3.0=h17f2ce3_3 - - libwebp-base=1.2.2=h0d85af4_1 - - libxml2=2.9.12=h7e28ab6_1 - - libzip=1.8.0=h8b0c345_1 - - libzlib=1.2.11=h6c3fc93_1014 - - llvm-openmp=13.0.1=hcb1a161_1 - - lz4-c=1.9.3=he49afe7_1 - - mccabe=0.6.1=py_1 - - ncurses=6.3=h96cf925_1 - - nspr=4.32=hcd9eead_1 - - nss=3.77=hfce436b_0 - - numpy=1.21.5=py37h3c8089f_0 - - openjpeg=2.4.0=h6e7aa92_1 - - openssl=1.1.1n=h6c3fc93_0 - - pcre=8.45=he49afe7_0 - - pip=22.0.4=pyhd8ed1ab_0 - - pixman=0.40.0=hbcb3906_0 - - platformdirs=2.5.1=pyhd8ed1ab_0 - - poppler=22.01.0=h39497b0_2 - - poppler-data=0.4.11=hd8ed1ab_0 - - postgresql=14.2=he8fe76e_0 - - proj=9.0.0=h2364a93_1 - - pycodestyle=2.8.0=pyhd8ed1ab_0 - - pycparser=2.21=pyhd8ed1ab_0 - - pylint=2.12.2=pyhd8ed1ab_0 - - pyopenssl=22.0.0=pyhd8ed1ab_0 - - pysocks=1.7.1=py37hf985489_5 - - python=3.7.12=haf480d7_100_cpython - - python_abi=3.7=2_cp37m - - readline=8.1=h05e3726_0 - - requests=2.27.1=pyhd8ed1ab_0 - - setuptools=62.0.0=py37hf985489_0 - - shapely=1.8.0=py37h9a02b95_5 - - sqlite=3.37.1=hb516253_0 - - tiledb=2.7.2=h190f7ed_0 - - tk=8.6.12=h5dbffcc_0 - - toml=0.10.2=pyhd8ed1ab_0 - - typed-ast=1.5.2=py37h271585c_0 - - typing-extensions=4.1.1=hd8ed1ab_0 - - typing_extensions=4.1.1=pyha770c72_0 - - tzcode=2022a=h5eb16cf_0 - - tzdata=2022a=h191b570_0 - - urllib3=1.26.9=pyhd8ed1ab_0 - - wheel=0.37.1=pyhd8ed1ab_0 - - wrapt=1.13.3=py37h271585c_1 - - xerces-c=3.2.3=h6564042_4 - - xz=5.2.5=haf1e3a3_1 - - zlib=1.2.11=h6c3fc93_1014 - - zstd=1.5.2=h582d3a0_0 -prefix: /Users/benjamin/opt/anaconda3/envs/gdal-dev diff --git a/conda_env/environment-win.yml b/conda_env/environment-win.yml deleted file mode 100644 index 8ac9f2e5..00000000 --- a/conda_env/environment-win.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: gdal-dev -channels: - - conda-forge - - defaults -dependencies: - - astroid=2.9.3=py37h03978a9_0 - - autopep8=1.6.0=pyhd8ed1ab_1 - - blosc=1.21.0=h0e60522_0 - - boost-cpp=1.74.0=h9f4b32c_8 - - brotlipy=0.7.0=py37hcc03f2d_1004 - - bzip2=1.0.8=h8ffe710_4 - - ca-certificates=2021.10.8=h5b45459_0 - - cairo=1.16.0=h15b3021_1010 - - certifi=2021.10.8=py37h03978a9_2 - - cffi=1.15.0=py37hd8e9650_0 - - cfitsio=4.1.0=h5a969a9_0 - - charset-normalizer=2.0.12=pyhd8ed1ab_0 - - colorama=0.4.4=pyh9f0ad1d_0 - - cryptography=36.0.2=py37h65266a2_1 - - curl=7.82.0=h789b8ee_0 - - expat=2.4.8=h39d44d4_0 - - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - - font-ttf-inconsolata=3.000=h77eed37_0 - - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 - - fontconfig=2.14.0=hce3cb01_0 - - fonts-conda-ecosystem=1=0 - - fonts-conda-forge=1=0 - - freetype=2.10.4=h546665d_1 - - freexl=1.0.6=ha8e266a_0 - - gdal=3.4.2=py37hd4e592b_4 - - geojson=2.5.0=py_0 - - geos=3.10.2=h39d44d4_0 - - geotiff=1.7.1=h38b14a8_1 - - gettext=0.19.8.1=ha2e2712_1008 - - hdf4=4.2.15=h0e5069d_3 - - hdf5=1.12.1=nompi_h2a0e4a3_104 - - icu=69.1=h0e60522_0 - - idna=3.3=pyhd8ed1ab_0 - - intel-openmp=2022.0.0=h57928b3_3663 - - isort=5.10.1=pyhd8ed1ab_0 - - jbig=2.1=h8d14728_2003 - - jpeg=9e=h8ffe710_0 - - kealib=1.4.14=h8995ca9_3 - - krb5=1.19.3=h1176d77_0 - - lazy-object-proxy=1.7.1=py37hcc03f2d_1 - - lcms2=2.12=h2a16943_0 - - lerc=3.0=h0e60522_0 - - libblas=3.9.0=14_win64_mkl - - libcblas=3.9.0=14_win64_mkl - - libcurl=7.82.0=h789b8ee_0 - - libdeflate=1.10=h8ffe710_0 - - libffi=3.4.2=h8ffe710_5 - - libgdal=3.4.2=h0bdba65_4 - - libglib=2.70.2=h3be07f2_4 - - libiconv=1.16=he774522_0 - - libkml=1.3.0=h9859afa_1014 - - liblapack=3.9.0=14_win64_mkl - - libnetcdf=4.8.1=nompi_h1cc8e9d_101 - - libpng=1.6.37=h1d00b33_2 - - libpq=14.2=hfcc5ef8_0 - - librttopo=1.1.0=hb1df466_9 - - libspatialite=5.0.1=h36c16d9_15 - - libssh2=1.10.0=h680486a_2 - - libtiff=4.3.0=hc4061b1_3 - - libwebp-base=1.2.2=h8ffe710_1 - - libxml2=2.9.12=hf5bbc77_2 - - libzip=1.8.0=hfed4ece_1 - - libzlib=1.2.11=h8ffe710_1014 - - lz4-c=1.9.3=h8ffe710_1 - - mccabe=0.6.1=py_1 - - mkl=2022.0.0=h0e2418a_796 - - numpy=1.21.5=py37h5fa1a60_0 - - openjpeg=2.4.0=hb211442_1 - - openssl=1.1.1n=h8ffe710_0 - - pcre=8.45=h0e60522_0 - - pip=22.0.4=pyhd8ed1ab_0 - - pixman=0.40.0=h8ffe710_0 - - platformdirs=2.5.1=pyhd8ed1ab_0 - - poppler=22.01.0=h24fffdf_2 - - poppler-data=0.4.11=hd8ed1ab_0 - - postgresql=14.2=h1c22c4f_0 - - proj=9.0.0=h1cfcee9_1 - - pycodestyle=2.8.0=pyhd8ed1ab_0 - - pycparser=2.21=pyhd8ed1ab_0 - - pylint=2.12.2=pyhd8ed1ab_0 - - pyopenssl=22.0.0=pyhd8ed1ab_0 - - pysocks=1.7.1=py37h03978a9_5 - - python=3.7.12=h7840368_100_cpython - - python_abi=3.7=2_cp37m - - requests=2.27.1=pyhd8ed1ab_0 - - setuptools=62.0.0=py37h03978a9_0 - - shapely=1.8.0=py37h715dd35_5 - - sqlite=3.37.1=h8ffe710_0 - - tbb=2021.5.0=h2d74725_1 - - tiledb=2.7.2=h95dad36_0 - - toml=0.10.2=pyhd8ed1ab_0 - - typed-ast=1.5.2=py37hcc03f2d_0 - - typing-extensions=4.1.1=hd8ed1ab_0 - - typing_extensions=4.1.1=pyha770c72_0 - - ucrt=10.0.20348.0=h57928b3_0 - - urllib3=1.26.9=pyhd8ed1ab_0 - - vc=14.2=hb210afc_6 - - vs2015_runtime=14.29.30037=h902a5da_6 - - wheel=0.37.1=pyhd8ed1ab_0 - - win_inet_pton=1.1.0=py37h03978a9_4 - - wrapt=1.13.3=py37hcc03f2d_1 - - xerces-c=3.2.3=h0e60522_4 - - xz=5.2.5=h62dcd97_1 - - zlib=1.2.11=h8ffe710_1014 - - zstd=1.5.2=h6255e5f_0 -prefix: C:\Users\bkreusc\Anaconda3\envs\gdal-dev diff --git a/conda_env/gdal-dev.yml b/conda_env/gdal-dev.yml index 2998b7d4..94c575cf 100644 --- a/conda_env/gdal-dev.yml +++ b/conda_env/gdal-dev.yml @@ -4,11 +4,11 @@ channels: dependencies: - python=3.7 - gdal=3.4.* - - requests=2.27.* - - pylint=2.12.* + - requests=2.28.* + - pylint=2.15.* - geojson=2.5.* - shapely=1.8.* - - autopep8=1.6.* + - autopep8=1.7.* - mock - twine - pip diff --git a/conda_env/requirements.txt b/conda_env/requirements.txt deleted file mode 100644 index 5c10edf6011c67e2282b949e1597c6d4c8288a29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1052 zcmZ{jOHRXJ41~Q#;wVK;U%-M>aDqP4k}5CKRK`o5I*8 zmRM68d#AO1(5<6i4tr!Zs-0DQE2+D>isn=QF>lPbhE+Oq>0B`aO^h9tjqTBG&`b)N zFZyb)nl1^+`tPdH1#^(SGzD}V=J_Cw$#im{Kn28s?mmvzNUh+rfvmWsHPN} z`Sukx?X6D8E8kB6;%JLoOH{VLTgC3m zK6K=)(vQAUkh>c?>IN=U#^mA+UWliJYB={Es;~0D$498`>0fhmP0!Zsk>+2nWQ5?TgJH|bT`o#Y*PAlQ@IHC)?l&p4yk#Rlb^W1# zK)s|o-EGp)MzOvAjS5aelXF}xTuYvU Yi<|b!vH9Gc`+~7VedwF{-xa(40zDX+KL7v# diff --git a/setup.cfg b/setup.cfg index 33b63c55..8661e31d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ classifiers = packages = wahoomc python_requires = >=3.7 install_requires = - requests==2.27.* + requests==2.28.* shapely==1.8.* [options.package_data]