Move deps in req file and force upgrade importlib-metadata - hopefully this problem goes away on travis:

ionelmc · ionelmc · commit c42609b4810c · 2020-11-25T15:22:32.000+02:00
pkg_resources.ContextualVersionConflict: (importlib-metadata 0.23 (/home/travis/virtualenv/python3.6.9/lib/python3.6/site-packages), Requirement.parse('importlib-metadata&gt;=1; python_version &lt; "3.8"'), {'keyring'})
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -126,7 +126,7 @@ init:
   - ps: echo $env:TOXENV
   - ps: ls C:\Python*
 install:
-  - '%PYTHON_HOME%\python -mpip install --progress-bar=off twine tox-wheel -rci/requirements.txt'
+  - '%PYTHON_HOME%\python -mpip install --progress-bar=off -rci/requirements.txt'
   - '%PYTHON_HOME%\Scripts\virtualenv --version'
   - '%PYTHON_HOME%\Scripts\easy_install --version'
   - '%PYTHON_HOME%\Scripts\pip --version'
diff --git a/.travis.yml b/.travis.yml
@@ -153,7 +153,7 @@ before_install:
       export PATH="/usr/local/opt/python/libexec/bin:${PATH}"
     fi
 install:
-  - python -mpip install --progress-bar=off --upgrade twine tox-wheel -rci/requirements.txt
+  - python -mpip install --progress-bar=off --upgrade -rci/requirements.txt
   - virtualenv --version
   - easy_install --version
   - pip --version
diff --git a/ci/requirements.txt b/ci/requirements.txt
@@ -2,3 +2,6 @@ virtualenv>=16.6.0
 pip>=19.1.1
 setuptools>=18.0.1
 six>=1.14.0
+importlib-metadata>=1.0
+twine
+tox-wheel
diff --git a/ci/templates/.appveyor.yml b/ci/templates/.appveyor.yml
@@ -38,7 +38,7 @@ init:
   - ps: echo $env:TOXENV
   - ps: ls C:\Python*
 install:
-  - '%PYTHON_HOME%\python -mpip install --progress-bar=off twine tox-wheel -rci/requirements.txt'
+  - '%PYTHON_HOME%\python -mpip install --progress-bar=off -rci/requirements.txt'
   - '%PYTHON_HOME%\Scripts\virtualenv --version'
   - '%PYTHON_HOME%\Scripts\easy_install --version'
   - '%PYTHON_HOME%\Scripts\pip --version'
diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
@@ -58,7 +58,7 @@ before_install:
       export PATH="/usr/local/opt/python/libexec/bin:${PATH}"
     fi
 install:
-  - python -mpip install --progress-bar=off --upgrade twine tox-wheel -rci/requirements.txt
+  - python -mpip install --progress-bar=off --upgrade -rci/requirements.txt
   - virtualenv --version
   - easy_install --version
   - pip --version
