Merge remote-tracking branch 'origin/SSA-6324-pytest-branch2-scode-update'...

Merge remote-tracking branch 'origin/SSA-6324-pytest-branch2-scode-update' into SSA-6324-pytest-branch2-scode-update

# Conflicts:
#	environment.yml

apps/cli/executables/datafetcher/test/Dockerfile

@@ -15,7 +15,7 @@ FROM continuumio/miniconda3:latest
 
 COPY environment.yml .
 
-ENV PATH $HOME/miniconda3/condabin/conda:$PATH
+ENV PATH $HOME/miniconda3/bin/conda:$PATH
 
 # docker_build.sh should have copied environment.yml from data/;
 # it will be used in the command below

apps/cli/executables/datafetcher/tox.ini

-# Using tox to test this app against different versions of python, see
-# https://tox.readthedocs.io/en/latest/
-
-[tox]
-envlist = py27, py34, py35, py36, py37, py38
-skip_missing_interpreters = True
-
-[testenv]
-passenv = *
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-commands = python -V
-           env
-           {envpython} setup.py install
-           {envpython} setup.py test
-basepython = py27: {env:TOXPYTHON:python2.7}
-             py34: {env:TOXPYTHON:python3.4}
-             py35: {env:TOXPYTHON:python3.5}
-             py36: {env:TOXPYTHON:python3.6}
-             py37: {env:TOXPYTHON:python3.7}
-             py38: {env:TOXPYTHON:python3.8}
-
-[pytest]
-console_output_style = progress
-log_cli = True
-

environment.yml

@@ -24,7 +24,7 @@ dependencies:
   - pysftp=0.2.9
   - pytest=5.4
   - python=3.8
-  - requests>=2.23,<3.0
+  - requests=2.23
   - simplejson=3.17
   - sqlalchemy=1.3
   - tqdm=4.46