diff --git a/README.md b/README.md index 62aab631..4bf50d17 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ PILOT has originally been developed in Mathworks' MatLab. In order to distribute problems, it has been decided to redevelop the software package in Python. The great work of the ObsPy group allows easy handling of a bunch of seismic data and PyLoT will benefit a lot compared to the former MatLab version. -The development of PyLoT is part of the joint research project MAGS2 and AlpArray. +The development of PyLoT is part of the joint research project MAGS2, AlpArray and AdriaArray. ## Installation @@ -27,28 +27,30 @@ Afterwards run (from the PyLoT main directory where the files *requirements.txt* conda env create -f pylot.yml or - conda create --name pylot_38 --file requirements.txt + conda create -c conda-forge --name pylot_311 python=3.11 --file requirements.txt -to create a new Anaconda environment called "pylot_38". +to create a new Anaconda environment called *pylot_311*. Afterwards activate the environment by typing - conda activate pylot_38 + conda activate pylot_311 #### Prerequisites: In order to run PyLoT you need to install: - Python 3 -- obspy -- pyside2 -- pyqtgraph - cartopy +- joblib +- obspy +- pyaml +- pyqtgraph +- pyside2 (the following are already dependencies of the above packages): - scipy - numpy -- matplotlib <= 3.3.x +- matplotlib #### Some handwork: @@ -108,4 +110,4 @@ Others: A. Bruestle, T. Meier, W. Friederich [ObsPy]: http://github.com/obspy/obspy/wiki -April 2022 +August 2024 diff --git a/pylot.yml b/pylot.yml index 5df94348..d7ec4e0c 100644 --- a/pylot.yml +++ b/pylot.yml @@ -3,128 +3,10 @@ channels: - conda-forge - defaults dependencies: - - brotli=1.1.0=hcfcfb64_1 - - brotli-bin=1.1.0=hcfcfb64_1 - - brotli-python=1.1.0=py311h12c1d0e_1 - - bzip2=1.0.8=h2466b09_7 - - ca-certificates=2024.7.4=h56e8100_0 - cartopy=0.23.0=py311hcf9f919_1 - - certifi=2024.7.4=pyhd8ed1ab_0 - - cffi=1.17.0=py311he736701_0 - - charset-normalizer=3.3.2=pyhd8ed1ab_0 - - colorama=0.4.6=pyhd8ed1ab_0 - - contourpy=1.2.1=py311h005e61a_0 - - cycler=0.12.1=pyhd8ed1ab_0 - - decorator=5.1.1=pyhd8ed1ab_0 - - exceptiongroup=1.2.2=pyhd8ed1ab_0 - - fonttools=4.53.1=py311he736701_0 - - freetype=2.12.1=hdaf720e_2 - - geos=3.12.2=h5a68840_1 - - glib=2.80.3=h7025463_1 - - glib-tools=2.80.3=h4394cf3_1 - - greenlet=3.0.3=py311h12c1d0e_0 - - gst-plugins-base=1.24.6=hb0a98b8_0 - - gstreamer=1.24.6=h5006eae_0 - - h2=4.1.0=pyhd8ed1ab_0 - - hpack=4.0.0=pyh9f0ad1d_0 - - hyperframe=6.0.1=pyhd8ed1ab_0 - - icu=73.2=h63175ca_0 - - idna=3.7=pyhd8ed1ab_0 - - iniconfig=2.0.0=pyhd8ed1ab_0 - - intel-openmp=2024.2.0=h57928b3_980 - joblib=1.4.2=pyhd8ed1ab_0 - - kiwisolver=1.4.5=py311h005e61a_1 - - krb5=1.21.3=hdf4eb48_0 - - lcms2=2.16=h67d730c_0 - - lerc=4.0.0=h63175ca_0 - - libblas=3.9.0=23_win64_mkl - - libbrotlicommon=1.1.0=hcfcfb64_1 - - libbrotlidec=1.1.0=hcfcfb64_1 - - libbrotlienc=1.1.0=hcfcfb64_1 - - libcblas=3.9.0=23_win64_mkl - - libclang13=18.1.8=default_ha5278ca_1 - - libcurl=8.9.1=h18fefc2_0 - - libdeflate=1.21=h2466b09_0 - - libexpat=2.6.2=h63175ca_0 - - libffi=3.4.2=h8ffe710_5 - - libglib=2.80.3=h7025463_1 - - libhwloc=2.11.1=default_h8125262_1000 - - libiconv=1.17=hcfcfb64_2 - - libintl=0.22.5=h5728263_2 - - libintl-devel=0.22.5=h5728263_2 - - libjpeg-turbo=3.0.0=hcfcfb64_1 - - liblapack=3.9.0=23_win64_mkl - - libogg=1.3.5=h2466b09_0 - - libpng=1.6.43=h19919ed_0 - - libsqlite=3.46.0=h2466b09_0 - - libssh2=1.11.0=h7dfc565_0 - - libtiff=4.6.0=hb151862_4 - - libvorbis=1.3.7=h0e60522_0 - - libwebp=1.4.0=h2466b09_0 - - libwebp-base=1.4.0=hcfcfb64_0 - - libxcb=1.16=hcd874cb_0 - - libxml2=2.12.7=h0f24e4e_4 - - libxslt=1.1.39=h3df6e99_0 - - libzlib=1.3.1=h2466b09_1 - - lxml=5.2.2=py311h12967d8_0 - - m2w64-gcc-libgfortran=5.3.0=6 - - m2w64-gcc-libs=5.3.0=7 - - m2w64-gcc-libs-core=5.3.0=7 - - m2w64-gmp=6.1.0=2 - - m2w64-libwinpthread-git=5.0.0.4634.697f757=2 - - matplotlib-base=3.8.4=py311h9b31f6e_2 - - mkl=2024.1.0=h66d3029_694 - - msys2-conda-epoch=20160418=1 - - munkres=1.1.4=pyh9f0ad1d_0 - - numpy=1.26.4=py311h0b4df5a_0 - obspy=1.4.1=py311he736701_3 - - openjpeg=2.5.2=h3d672ee_0 - - openssl=3.3.1=h2466b09_2 - - packaging=24.1=pyhd8ed1ab_0 - - pcre2=10.44=h3d7b363_0 - - pillow=10.4.0=py311h5592be9_0 - - pip=24.2=pyhd8ed1ab_0 - - pluggy=1.5.0=pyhd8ed1ab_0 - - proj=9.4.1=hd9569ee_1 - - pthread-stubs=0.4=hcd874cb_1001 - - pthreads-win32=2.9.1=hfa6e2cd_3 - pyaml=24.7.0=pyhd8ed1ab_0 - - pycparser=2.22=pyhd8ed1ab_0 - - pyparsing=3.1.2=pyhd8ed1ab_0 - - pyproj=3.6.1=py311h93f6e28_8 - pyqtgraph=0.13.7=pyhd8ed1ab_0 - - pyshp=2.3.1=pyhd8ed1ab_0 - pyside2=5.15.8=py311h3d699ce_4 - - pysocks=1.7.1=pyh0701188_6 - - pytest=8.3.2=pyhd8ed1ab_0 - - python=3.11.9=h631f459_0_cpython - - python-dateutil=2.9.0=pyhd8ed1ab_0 - - python_abi=3.11=4_cp311 - - pyyaml=6.0.2=py311he736701_0 - - qt=5.15.8=h91493d7_0 - - qt-main=5.15.8=h06adc49_23 - - qt-webengine=5.15.8=h4bf5c4e_4 - - requests=2.32.3=pyhd8ed1ab_0 - - scipy=1.14.0=py311hd4686c6_1 - - setuptools=72.1.0=pyhd8ed1ab_0 - - shapely=2.0.5=py311hf837ac7_0 - - six=1.16.0=pyh6c4a22f_0 - - sqlalchemy=1.4.49=py311ha68e1ae_1 - - sqlite=3.46.0=h2466b09_0 - - tbb=2021.12.0=hc790b64_3 - - tk=8.6.13=h5226925_1 - - tomli=2.0.1=pyhd8ed1ab_0 - - tzdata=2024a=h0c530f3_0 - - ucrt=10.0.22621.0=h57928b3_0 - - urllib3=2.2.2=pyhd8ed1ab_1 - - vc=14.3=h8a93ad2_20 - - vc14_runtime=14.40.33810=ha82c5b3_20 - - vs2015_runtime=14.40.33810=h3bf8584_20 - - wheel=0.44.0=pyhd8ed1ab_0 - - win_inet_pton=1.1.0=pyhd8ed1ab_6 - - xorg-libxau=1.0.11=hcd874cb_0 - - xorg-libxdmcp=1.1.3=hcd874cb_0 - - xz=5.2.6=h8d14728_0 - - yaml=0.2.5=h8ffe710_2 - - zstandard=0.23.0=py311h53056dc_0 - - zstd=1.5.6=h0ea2cb4_0 + - pytest=8.3.2=pyhd8ed1ab_0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 33a0b37a..f402a681 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,51 +1,7 @@ -Brotli==1.1.0 Cartopy==0.23.0 -certifi==2024.7.4 -cffi==1.17.0 -charset-normalizer==3.3.2 -colorama==0.4.6 -contourpy==1.2.1 -cycler==0.12.1 -decorator==5.1.1 -exceptiongroup==1.2.2 -fonttools==4.53.1 -greenlet==3.0.3 -h2==4.1.0 -hpack==4.0.0 -hyperframe==6.0.1 -idna==3.7 -iniconfig==2.0.0 joblib==1.4.2 -kiwisolver==1.4.5 -lxml==5.2.2 -matplotlib==3.8.4 -munkres==1.1.4 -numpy==1.26.4 obspy==1.4.1 -packaging==24.1 -pillow==10.4.0 -pip==24.2 -pluggy==1.5.0 pyaml==24.7.0 -pycparser==2.22 -pyparsing==3.1.2 -pyproj==3.6.1 pyqtgraph==0.13.7 -pyshp==2.3.1 PySide2==5.15.8 -PySocks==1.7.1 -pytest==8.3.2 -python-dateutil==2.9.0 -PyYAML==6.0.2 -requests==2.32.3 -scipy==1.14.0 -setuptools==72.1.0 -shapely==2.0.5 -shiboken2==5.15.8 -six==1.16.0 -SQLAlchemy==1.4.49 -tomli==2.0.1 -urllib3==2.2.2 -wheel==0.44.0 -win-inet-pton==1.1.0 -zstandard==0.23.0 +pytest==8.3.2 \ No newline at end of file