Merge branch 'master' into development

Author: gjbex

environment.yml

@@ -3,160 +3,11 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - _libgcc_mutex=0.1=main
-  - argon2-cffi=20.1.0=py37h7b6447c_1
-  - astroid=2.4.2=py37_0
-  - async_generator=1.10=py37h28b3542_0
-  - attrs=20.3.0=pyhd3eb1b0_0
-  - backcall=0.2.0=py_0
-  - blas=1.0=mkl
-  - bleach=3.2.1=py_0
-  - brotlipy=0.7.0=py37h27cfd23_1003
-  - ca-certificates=2020.12.5=ha878542_0
-  - certifi=2020.12.5=py37h89c1867_0
-  - cffi=1.14.4=py37h261ae71_0
-  - chardet=3.0.4=py37h06a4308_1003
-  - colorama=0.4.4=pyh9f0ad1d_0
-  - cryptography=3.3.1=py37h3c74f83_0
-  - cycler=0.10.0=py37_0
-  - dbus=1.13.18=hb2f20db_0
-  - decorator=4.4.2=py_0
-  - defusedxml=0.6.0=py_0
-  - entrypoints=0.3=py37_0
-  - expat=2.2.10=he6710b0_2
-  - flake8=3.8.4=py_0
-  - fontconfig=2.13.0=h9420a91_0
-  - freetype=2.10.4=h5ab3b9f_0
-  - gitdb=4.0.5=py_0
-  - gitpython=3.1.11=py_0
-  - glib=2.66.1=h92f7085_0
-  - gmp=6.1.2=h6c8ec71_1
-  - gst-plugins-base=1.14.0=hbbd80ab_1
-  - gstreamer=1.14.0=hb31296c_0
-  - icu=58.2=he6710b0_3
-  - idna=2.10=py_0
-  - importlib-metadata=2.0.0=py_1
-  - importlib_metadata=2.0.0=1
-  - iniconfig=1.1.1=py_0
-  - intel-openmp=2020.2=254
-  - ipykernel=5.3.4=py37h5ca1d4c_0
-  - ipython=7.19.0=py37hb070fc8_0
-  - ipython_genutils=0.2.0=pyhd3eb1b0_1
-  - ipywidgets=7.5.1=py_1
-  - isort=5.6.4=py_0
-  - jedi=0.15.1=py37_0
-  - jinja2=2.11.2=py_0
-  - jpeg=9b=h024ee3a_2
-  - json5=0.9.5=py_0
-  - jsonschema=3.2.0=py_2
-  - jupyter=1.0.0=py37_7
-  - jupyter_client=6.1.7=py_0
-  - jupyter_console=6.2.0=py_0
-  - jupyter_core=4.7.0=py37h06a4308_0
-  - jupyterlab=2.2.6=py_0
-  - jupyterlab-git=0.23.2=pyhd8ed1ab_0
-  - jupyterlab_pygments=0.1.2=py_0
-  - jupyterlab_server=1.2.0=py_0
-  - kiwisolver=1.3.0=py37h2531618_0
-  - lazy-object-proxy=1.4.3=py37h27cfd23_2
-  - lcms2=2.11=h396b838_0
-  - ld_impl_linux-64=2.33.1=h53a641e_7
-  - libedit=3.1.20191231=h14c3975_1
-  - libffi=3.3=he6710b0_2
-  - libgcc-ng=9.1.0=hdf63c60_0
-  - libgfortran-ng=8.2.0=hdf63c60_1
-  - libpng=1.6.37=hbc83047_0
-  - libsodium=1.0.18=h7b6447c_0
-  - libstdcxx-ng=9.1.0=hdf63c60_0
-  - libtiff=4.1.0=h2733197_1
-  - libuuid=1.0.3=h1bed415_2
-  - libxcb=1.14=h7b6447c_0
-  - libxml2=2.9.10=hb55368b_3
-  - lz4-c=1.9.2=heb0550a_3
-  - markupsafe=1.1.1=py37h14c3975_1
-  - matplotlib=3.3.2=h06a4308_0
-  - matplotlib-base=3.3.2=py37h817c723_0
-  - mccabe=0.6.1=py37_1
-  - mistune=0.8.4=py37h14c3975_1001
-  - mkl=2020.2=256
-  - mkl-service=2.3.0=py37he8ac12f_0
-  - mkl_fft=1.2.0=py37h23d657b_0
-  - mkl_random=1.1.1=py37h0573a6f_0
-  - more-itertools=8.6.0=pyhd3eb1b0_0
-  - mypy=0.790=py_0
-  - mypy_extensions=0.4.3=py37_0
-  - nbclient=0.5.1=py_0
-  - nbconvert=6.0.7=py37_0
-  - nbdime=2.1.0=py_0
-  - nbformat=5.0.8=py_0
-  - ncurses=6.2=he6710b0_1
-  - nest-asyncio=1.4.3=pyhd3eb1b0_0
-  - nodejs=10.13.0=he6710b0_0
-  - notebook=6.1.5=py37h06a4308_0
-  - numpy=1.19.2=py37h54aff64_0
-  - numpy-base=1.19.2=py37hfa32c7d_0
-  - olefile=0.46=py37_0
-  - openssl=1.1.1i=h27cfd23_0
-  - packaging=20.8=pyhd3eb1b0_0
-  - pandoc=2.11=hb0f4dca_0
-  - pandocfilters=1.4.3=py37h06a4308_1
-  - parso=0.8.1=pyhd3eb1b0_0
-  - pcre=8.44=he6710b0_0
-  - pexpect=4.8.0=pyhd3eb1b0_3
-  - pickleshare=0.7.5=pyhd3eb1b0_1003
-  - pillow=8.0.1=py37he98fc37_0
-  - pip=20.3.3=py37h06a4308_0
-  - pluggy=0.13.1=py37_0
-  - prometheus_client=0.9.0=pyhd3eb1b0_0
-  - prompt-toolkit=3.0.8=py_0
-  - prompt_toolkit=3.0.8=0
-  - psutil=5.7.2=py37h7b6447c_0
-  - ptyprocess=0.6.0=pyhd3eb1b0_2
-  - py=1.10.0=pyhd3eb1b0_0
-  - pycodestyle=2.6.0=py_0
-  - pycparser=2.20=py_2
-  - pyflakes=2.2.0=py_0
-  - pygments=2.7.3=pyhd3eb1b0_0
-  - pylint=2.6.0=py37_0
-  - pyopenssl=20.0.1=pyhd3eb1b0_1
-  - pyparsing=2.4.7=py_0
-  - pyqt=5.9.2=py37h05f1152_2
-  - pyrsistent=0.17.3=py37h7b6447c_0
-  - pysocks=1.7.1=py37_1
-  - pytest=6.2.1=py37h06a4308_0
-  - python=3.7.9=h7579374_0
-  - python-dateutil=2.8.1=py_0
-  - python_abi=3.7=1_cp37m
-  - pytz=2020.4=pyhd3eb1b0_0
-  - pyzmq=20.0.0=py37h2531618_1
-  - qt=5.9.7=h5867ecd_1
-  - qtconsole=4.7.7=py_0
-  - qtpy=1.9.0=py_0
-  - readline=8.0=h7b6447c_0
-  - requests=2.25.0=pyhd3eb1b0_0
-  - send2trash=1.5.0=pyhd3eb1b0_1
-  - setuptools=51.0.0=py37h06a4308_2
-  - sip=4.19.8=py37hf484d3e_0
-  - six=1.15.0=py37h06a4308_0
-  - smmap=3.0.4=pyh9f0ad1d_0
-  - sqlite=3.33.0=h62c20be_0
-  - terminado=0.9.1=py37_0
-  - testpath=0.4.4=py_0
-  - tk=8.6.10=hbc83047_0
-  - toml=0.10.1=py_0
-  - tornado=6.1=py37h27cfd23_0
-  - traitlets=5.0.5=py_0
-  - typed-ast=1.4.1=py37h7b6447c_0
-  - typing_extensions=3.7.4.3=py_0
-  - urllib3=1.25.11=py_0
-  - wcwidth=0.2.5=py_0
-  - webencodings=0.5.1=py37_1
-  - wheel=0.36.2=pyhd3eb1b0_0
-  - widgetsnbextension=3.5.1=py37_0
-  - wrapt=1.11.2=py37h7b6447c_0
-  - xz=5.2.5=h7b6447c_0
-  - zeromq=4.3.3=he6710b0_3
-  - zipp=3.4.0=pyhd3eb1b0_0
-  - zlib=1.2.11=h7b6447c_3
-  - zstd=1.4.5=h9ceee32_0
-prefix: /home/gjb/miniconda3/envs/python_software_engineering
+  - flake8
+  - jupyterlab
+  - matplotlib
+  - mypy
+  - pylint
+  - pyparsing
+  - pytest
+  - python=3.7.10