From 34d830689bfde17f001cead5aae280eb02d51c7c Mon Sep 17 00:00:00 2001
From: Shay Palachy <shaypal5@gmail.com>
Date: Tue, 28 Jan 2020 16:57:33 +0200
Subject: [PATCH] added pip install -U pip back to general travis build - pip
 20.2 should work

---
 .travis.yml |  2 +-
 pytest.ini  | 13 +++++++++++++
 tox.ini     | 36 ------------------------------------
 3 files changed, 14 insertions(+), 37 deletions(-)
 create mode 100644 pytest.ini
 delete mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index adb9911..67a45d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,7 @@ matrix:
       env: PATH=/c/Python37:/c/Python37/Scripts:$PATH
 before_install:
   - python --version
-  # - pip install -U pip
+  - pip install -U pip
   - pip install -U pytest
   - pip install codecov
   - pip install pymongo
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..09575d5
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,13 @@
+[pytest]
+testpaths =
+    tests
+    cachier
+norecursedirs=dist build .tox
+addopts =
+    # --doctest-modules
+    --cov=cachier
+    --cov-report term
+    --cov-report xml:cov.xml
+    -r a
+    -v
+    -s
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 8eebf12..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[tox]
-envlist =
-    py27
-    py35
-    py36
-# recreate = True
-
-[testenv]
-deps =
-    ; equivalent to pip -e .[test]
-    -e{toxinidir}[test]
-    ;-r{toxinidir}/tools/pip-requires
-    ;-r{toxinidir}/tools/test-require
-commands=py.test  # or 'nosetests' or ...
-usedevelop = true
-
-# [testenv:doctesting]
-# basepython = python
-# usedevelop=True
-# skipsdist=True
-# commands=
-#     pytest --doctest-modules --pyargs _pytest
-
-[pytest]
-testpaths =
-    tests
-    cachier
-norecursedirs=dist build .tox
-addopts =
-    # --doctest-modules
-    --cov=cachier
-    --cov-report term
-    --cov-report xml:cov.xml
-    -r a
-    -v
-    -s