Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DEV] Update unittest files for Windows and macOS after sharpening Anaconda environment #83

Merged
merged 2 commits into from
Jan 18, 2022
Merged

[DEV] Update unittest files for Windows and macOS after sharpening Anaconda environment #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a0fbed
update test-files to new setup on macOS
treee111 Jan 17, 2022
5d189e2
update test-files to new setup on Windows
treee111 Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 134 additions & 0 deletions environment-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: conda-gdal02
channels:
- conda-forge
- defaults
dependencies:
- altgraph=0.17.2=pyhd8ed1ab_0
- astroid=2.9.2=py37hf985489_0
- autopep8=1.6.0=pyhd8ed1ab_1
- blosc=1.21.0=he49afe7_0
- boost-cpp=1.74.0=hf3dc895_5
- brotlipy=0.7.0=py37h271585c_1003
- bzip2=1.0.8=h0d85af4_4
- c-ares=1.18.1=h0d85af4_0
- ca-certificates=2021.10.8=h033912b_0
- cairo=1.16.0=he01c77b_1009
- certifi=2021.10.8=py37hf985489_1
- cffi=1.15.0=py37h446072c_0
- cfitsio=4.0.0=hb20e66c_0
- charset-normalizer=2.0.10=pyhd8ed1ab_0
- colorama=0.4.4=pyh9f0ad1d_0
- cryptography=36.0.1=py37h5e77fcc_0
- curl=7.81.0=hf45b732_0
- expat=2.4.2=he49afe7_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.13.1=h10f422b_1005
- 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.1=py37h005c65d_1
- geojson=2.5.0=py_0
- geos=3.10.1=he49afe7_1
- geotiff=1.7.0=h0ca5f94_6
- gettext=0.19.8.1=hd1a6beb_1008
- giflib=5.2.1=hbcb3906_2
- hdf4=4.2.15=hefd3b78_3
- hdf5=1.12.1=nompi_h2f0ef1a_103
- icu=69.1=he49afe7_0
- idna=3.1=pyhd3deb0d_0
- importlib-metadata=4.10.0=py37hf985489_0
- isort=5.10.1=pyhd8ed1ab_0
- jbig=2.1=h0d85af4_2003
- jpeg=9d=hbcb3906_0
- json-c=0.15=hcb556a6_0
- kealib=1.4.14=ha22a8b1_3
- krb5=1.19.2=hcfbf3a7_3
- lazy-object-proxy=1.7.1=py37h271585c_0
- lcms2=2.12=h577c468_0
- lerc=3.0=he49afe7_0
- libblas=3.9.0=12_osx64_openblas
- libcblas=3.9.0=12_osx64_openblas
- libcurl=7.81.0=hf45b732_0
- libcxx=12.0.1=habf9029_1
- libdap4=3.20.6=h3e144a0_2
- libdeflate=1.8=h0d85af4_0
- libedit=3.1.20191231=h0678c8f_2
- libev=4.33=haf1e3a3_1
- libffi=3.4.2=h0d85af4_5
- libgdal=3.4.1=h09ae624_1
- libgfortran=5.0.0=9_3_0_h6c81a4c_23
- libgfortran5=9.3.0=h6c81a4c_23
- libglib=2.70.2=hf1fb8c0_1
- libiconv=1.16=haf1e3a3_0
- libkml=1.3.0=h8fd9edb_1014
- liblapack=3.9.0=12_osx64_openblas
- libnetcdf=4.8.1=nompi_h6609ca0_101
- libnghttp2=1.43.0=h6f36284_1
- libopenblas=0.3.18=openmp_h3351f45_0
- libpng=1.6.37=h7cec526_2
- libpq=14.1=hea3049e_1
- librttopo=1.1.0=h0d74fd6_8
- libspatialite=5.0.1=h4dd8892_13
- libssh2=1.10.0=h52ee1ee_2
- libtiff=4.3.0=hd146c10_2
- libwebp-base=1.2.1=h0d85af4_0
- libxml2=2.9.12=h7e28ab6_1
- libzip=1.8.0=h8b0c345_1
- libzlib=1.2.11=h9173be1_1013
- llvm-openmp=12.0.1=hda6cdc1_1
- lz4-c=1.9.3=he49afe7_1
- mccabe=0.6.1=py_1
- ncurses=6.2=h2e338ed_4
- nspr=4.32=hcd9eead_1
- nss=3.74=h31e2bf1_0
- numpy=1.21.5=py37h3c8089f_0
- openjpeg=2.4.0=h6e7aa92_1
- openssl=1.1.1l=h0d85af4_0
- pcre=8.45=he49afe7_0
- pip=21.3.1=pyhd8ed1ab_0
- pixman=0.40.0=hbcb3906_0
- platformdirs=2.3.0=pyhd8ed1ab_0
- poppler=21.11.0=h9573804_0
- poppler-data=0.4.11=hd8ed1ab_0
- postgresql=14.1=he8fe76e_1
- proj=8.2.1=h1512c50_0
- pycodestyle=2.8.0=pyhd8ed1ab_0
- pycparser=2.21=pyhd8ed1ab_0
- pyinstaller=4.8=py37h83b74e4_0
- pyinstaller-hooks-contrib=2021.5=pyhd8ed1ab_0
- pylint=2.12.2=pyhd8ed1ab_0
- pyopenssl=21.0.0=pyhd8ed1ab_0
- pysocks=1.7.1=py37hf985489_4
- 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=60.5.0=py37hf985489_0
- shapely=1.8.0=py37hd43bd85_4
- six=1.16.0=pyh6c4a22f_0
- sqlite=3.37.0=h23a322b_0
- tiledb=2.6.0=hca4410a_0
- tk=8.6.11=h5dbffcc_1
- toml=0.10.2=pyhd8ed1ab_0
- typed-ast=1.5.1=py37h271585c_0
- typing-extensions=4.0.1=hd8ed1ab_0
- typing_extensions=4.0.1=pyha770c72_0
- tzcode=2021e=h0d85af4_0
- tzdata=2021e=he74cb21_0
- urllib3=1.26.8=pyhd8ed1ab_1
- 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
- zipp=3.7.0=pyhd8ed1ab_0
- zlib=1.2.11=h9173be1_1013
- zstd=1.5.1=h582d3a0_0
- pip:
- macholib==1.15.2
- modulegraph==0.19.2
- py2app==0.26.1
prefix: /Users/benjamin/opt/anaconda3/envs/conda-gdal02
Binary file modified tests/resources/macos/134/89/land.dbf
View file
Open in desktop
Binary file not shown.
209 changes: 105 additions & 104 deletions tests/resources/macos/134/89/land1.osm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,105 @@
<osm version='0.6'>
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459320' version='1' lon='10.00074009361646' lat='48.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459321' version='1' lon='10.00074009361646' lat='46.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459322' version='1' lon='8.99925990638354' lat='46.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459323' version='1' lon='8.99925990638354' lat='48.0005' />
<way timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459324' version='1'>
<nd ref='22951459320' />
<nd ref='22951459321' />
<nd ref='22951459322' />
<nd ref='22951459323' />
<nd ref='22951459320' />
<tag k='NHD:x' v='9' />
<tag k='NHD:y' v='47' />
<tag k='natural' v='nosea' />
<tag k='layer' v='-5' />
</way>
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459325' version='1' lon='7.999259906383539' lat='48.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459326' version='1' lon='8.2651837' lat='48.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459327' version='1' lon='9.00074009361646' lat='48.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459328' version='1' lon='9.00074009361646' lat='46.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459329' version='1' lon='8.2651837' lat='46.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459330' version='1' lon='7.999259906383539' lat='46.9995' />
<way timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459331' version='1'>
<nd ref='22951459325' />
<nd ref='22951459326' />
<nd ref='22951459327' />
<nd ref='22951459328' />
<nd ref='22951459329' />
<nd ref='22951459330' />
<nd ref='22951459325' />
<tag k='NHD:x' v='8' />
<tag k='NHD:y' v='47' />
<tag k='natural' v='nosea' />
<tag k='layer' v='-5' />
</way>
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459332' version='1' lon='7.999273630164373' lat='47.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459333' version='1' lon='8.2651837' lat='47.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459334' version='1' lon='9.000726369835627' lat='47.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459335' version='1' lon='9.000726369835627' lat='45.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459336' version='1' lon='8.2651837' lat='45.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459337' version='1' lon='7.999273630164373' lat='45.9995' />
<way timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459338' version='1'>
<nd ref='22951459332' />
<nd ref='22951459333' />
<nd ref='22951459334' />
<nd ref='22951459335' />
<nd ref='22951459336' />
<nd ref='22951459337' />
<nd ref='22951459332' />
<tag k='NHD:x' v='8' />
<tag k='NHD:y' v='46' />
<tag k='natural' v='nosea' />
<tag k='layer' v='-5' />
</way>
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459339' version='1' lon='10.000726369835627' lat='47.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459340' version='1' lon='10.000726369835627' lat='45.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459341' version='1' lon='8.999273630164373' lat='45.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459342' version='1' lon='8.999273630164373' lat='47.0005' />
<way timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459343' version='1'>
<nd ref='22951459339' />
<nd ref='22951459340' />
<nd ref='22951459341' />
<nd ref='22951459342' />
<nd ref='22951459339' />
<tag k='NHD:x' v='9' />
<tag k='NHD:y' v='46' />
<tag k='natural' v='nosea' />
<tag k='layer' v='-5' />
</way>
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459344' version='1' lon='10.000754580247529' lat='49.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459345' version='1' lon='10.000754580247529' lat='47.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459346' version='1' lon='8.999245419752471' lat='47.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459347' version='1' lon='8.999245419752471' lat='49.0005' />
<way timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459348' version='1'>
<nd ref='22951459344' />
<nd ref='22951459345' />
<nd ref='22951459346' />
<nd ref='22951459347' />
<nd ref='22951459344' />
<tag k='NHD:x' v='9' />
<tag k='NHD:y' v='48' />
<tag k='natural' v='nosea' />
<tag k='layer' v='-5' />
</way>
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459349' version='1' lon='7.999245419752471' lat='49.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459350' version='1' lon='8.2651837' lat='49.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459351' version='1' lon='9.000754580247529' lat='49.0005' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459352' version='1' lon='9.000754580247529' lat='47.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459353' version='1' lon='8.2651837' lat='47.9995' />
<node timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459354' version='1' lon='7.999245419752471' lat='47.9995' />
<way timestamp='1969-12-31T23:59:59Z' changeset='-1' id='22951459355' version='1'>
<nd ref='22951459349' />
<nd ref='22951459350' />
<nd ref='22951459351' />
<nd ref='22951459352' />
<nd ref='22951459353' />
<nd ref='22951459354' />
<nd ref='22951459349' />
<tag k='NHD:x' v='8' />
<tag k='NHD:y' v='48' />
<tag k='natural' v='nosea' />
<tag k='layer' v='-5' />
</way>
</osm>
<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6" generator="osmium/1.13.2">
<node id="22951459320" version="1" timestamp="2106-02-07T06:28:15Z" lat="48.0005" lon="10.0007401"/>
<node id="22951459321" version="1" timestamp="2106-02-07T06:28:15Z" lat="46.9995" lon="10.0007401"/>
<node id="22951459322" version="1" timestamp="2106-02-07T06:28:15Z" lat="46.9995" lon="8.9992599"/>
<node id="22951459323" version="1" timestamp="2106-02-07T06:28:15Z" lat="48.0005" lon="8.9992599"/>
<node id="22951459325" version="1" timestamp="2106-02-07T06:28:15Z" lat="48.0005" lon="7.9992599"/>
<node id="22951459326" version="1" timestamp="2106-02-07T06:28:15Z" lat="48.0005" lon="8.2651837"/>
<node id="22951459327" version="1" timestamp="2106-02-07T06:28:15Z" lat="48.0005" lon="9.0007401"/>
<node id="22951459328" version="1" timestamp="2106-02-07T06:28:15Z" lat="46.9995" lon="9.0007401"/>
<node id="22951459329" version="1" timestamp="2106-02-07T06:28:15Z" lat="46.9995" lon="8.2651837"/>
<node id="22951459330" version="1" timestamp="2106-02-07T06:28:15Z" lat="46.9995" lon="7.9992599"/>
<node id="22951459332" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.0005" lon="7.9992736"/>
<node id="22951459333" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.0005" lon="8.2651837"/>
<node id="22951459334" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.0005" lon="9.0007264"/>
<node id="22951459335" version="1" timestamp="2106-02-07T06:28:15Z" lat="45.9995" lon="9.0007264"/>
<node id="22951459336" version="1" timestamp="2106-02-07T06:28:15Z" lat="45.9995" lon="8.2651837"/>
<node id="22951459337" version="1" timestamp="2106-02-07T06:28:15Z" lat="45.9995" lon="7.9992736"/>
<node id="22951459339" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.0005" lon="10.0007264"/>
<node id="22951459340" version="1" timestamp="2106-02-07T06:28:15Z" lat="45.9995" lon="10.0007264"/>
<node id="22951459341" version="1" timestamp="2106-02-07T06:28:15Z" lat="45.9995" lon="8.9992736"/>
<node id="22951459342" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.0005" lon="8.9992736"/>
<node id="22951459344" version="1" timestamp="2106-02-07T06:28:15Z" lat="49.0005" lon="10.0007546"/>
<node id="22951459345" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.9995" lon="10.0007546"/>
<node id="22951459346" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.9995" lon="8.9992454"/>
<node id="22951459347" version="1" timestamp="2106-02-07T06:28:15Z" lat="49.0005" lon="8.9992454"/>
<node id="22951459349" version="1" timestamp="2106-02-07T06:28:15Z" lat="49.0005" lon="7.9992454"/>
<node id="22951459350" version="1" timestamp="2106-02-07T06:28:15Z" lat="49.0005" lon="8.2651837"/>
<node id="22951459351" version="1" timestamp="2106-02-07T06:28:15Z" lat="49.0005" lon="9.0007546"/>
<node id="22951459352" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.9995" lon="9.0007546"/>
<node id="22951459353" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.9995" lon="8.2651837"/>
<node id="22951459354" version="1" timestamp="2106-02-07T06:28:15Z" lat="47.9995" lon="7.9992454"/>
<way id="22951459324" version="1" timestamp="2106-02-07T06:28:15Z">
<nd ref="22951459320"/>
<nd ref="22951459321"/>
<nd ref="22951459322"/>
<nd ref="22951459323"/>
<nd ref="22951459320"/>
<tag k="NHD:x" v="9"/>
<tag k="NHD:y" v="47"/>
<tag k="natural" v="nosea"/>
<tag k="layer" v="-5"/>
</way>
<way id="22951459331" version="1" timestamp="2106-02-07T06:28:15Z">
<nd ref="22951459325"/>
<nd ref="22951459326"/>
<nd ref="22951459327"/>
<nd ref="22951459328"/>
<nd ref="22951459329"/>
<nd ref="22951459330"/>
<nd ref="22951459325"/>
<tag k="NHD:x" v="8"/>
<tag k="NHD:y" v="47"/>
<tag k="natural" v="nosea"/>
<tag k="layer" v="-5"/>
</way>
<way id="22951459338" version="1" timestamp="2106-02-07T06:28:15Z">
<nd ref="22951459332"/>
<nd ref="22951459333"/>
<nd ref="22951459334"/>
<nd ref="22951459335"/>
<nd ref="22951459336"/>
<nd ref="22951459337"/>
<nd ref="22951459332"/>
<tag k="NHD:x" v="8"/>
<tag k="NHD:y" v="46"/>
<tag k="natural" v="nosea"/>
<tag k="layer" v="-5"/>
</way>
<way id="22951459343" version="1" timestamp="2106-02-07T06:28:15Z">
<nd ref="22951459339"/>
<nd ref="22951459340"/>
<nd ref="22951459341"/>
<nd ref="22951459342"/>
<nd ref="22951459339"/>
<tag k="NHD:x" v="9"/>
<tag k="NHD:y" v="46"/>
<tag k="natural" v="nosea"/>
<tag k="layer" v="-5"/>
</way>
<way id="22951459348" version="1" timestamp="2106-02-07T06:28:15Z">
<nd ref="22951459344"/>
<nd ref="22951459345"/>
<nd ref="22951459346"/>
<nd ref="22951459347"/>
<nd ref="22951459344"/>
<tag k="NHD:x" v="9"/>
<tag k="NHD:y" v="48"/>
<tag k="natural" v="nosea"/>
<tag k="layer" v="-5"/>
</way>
<way id="22951459355" version="1" timestamp="2106-02-07T06:28:15Z">
<nd ref="22951459349"/>
<nd ref="22951459350"/>
<nd ref="22951459351"/>
<nd ref="22951459352"/>
<nd ref="22951459353"/>
<nd ref="22951459354"/>
<nd ref="22951459349"/>
<tag k="NHD:x" v="8"/>
<tag k="NHD:y" v="48"/>
<tag k="natural" v="nosea"/>
<tag k="layer" v="-5"/>
</way>
</osm>
Binary file modified tests/resources/macos/134/89/merged.osm.pbf
View file
Open in desktop
Binary file not shown.
Binary file modified tests/resources/macos/134/89/split-liechtenstein-names.osm.pbf
View file
Open in desktop
Binary file not shown.
Binary file modified tests/resources/macos/134/89/split-liechtenstein.osm.pbf
View file
Open in desktop
Binary file not shown.
Binary file modified tests/resources/macos/138/100/land.dbf
View file
Open in desktop
Binary file not shown.
Loading