Fixed tox and all dependencies

viaduct-ai · Nov 20, 2019 · 9d733d6 · 9d733d6
1 parent f8b6ac2
commit 9d733d6
Show file tree

Hide file tree

Showing 18 changed files with 125 additions and 70 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,27 +3,21 @@ sudo: false
 
 python:
   - "2.7"
-  - "3.5"
   - "3.6"
+  - "3.7"
 env:
   - NB_VERSION=4
   - NB_VERSION=5
   - FLAKE8=true NB_VERSION=5
   - NOTEST=true NB_VERSION=5
 
-services:
-  - postgresql
-
-addons:
-  postgresql: "9.5"
-
 install:
   - pip install tox
 
 script:
   - if [[ $TRAVIS_PYTHON_VERSION = '2.7' ]]; then tox -e py27-notebook$NB_VERSION; fi
-  - if [[ $TRAVIS_PYTHON_VERSION = '3.5' ]]; then tox -e py35-notebook$NB_VERSION; fi
   - if [[ $TRAVIS_PYTHON_VERSION = '3.6' ]]; then tox -e py36-notebook$NB_VERSION; fi
+  - if [[ $TRAVIS_PYTHON_VERSION = '3.7' ]]; then tox -e py37-notebook$NB_VERSION; fi
   - if [[ $FLAKE8 = 'true' ]]; then tox -e notest; fi
   - if [[ $NOTEST = 'true' ]]; then tox -e flake8; fi
 

diff --git a/Pipfile b/Pipfile
@@ -20,6 +20,7 @@ psycopg2 = ">=2.6.1"
 requests = ">=2.7.0"
 six = ">=1.9.0"
 notebook = {extras = ["test"],version = ">=4.0"}
+hybrid-content-manager = {editable = true,extras = ["test"],path = "."}
 
 [requires]
 python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/hybrid-content-manager/__init__.py → hybrid_content_manager/__init__.py b/hybrid-content-manager/__init__.py → hybrid_content_manager/__init__.py
diff --git a/hybrid-content-manager/api_utils.py → hybrid_content_manager/api_utils.py b/hybrid-content-manager/api_utils.py → hybrid_content_manager/api_utils.py
diff --git a/hybrid-content-manager/hybridmanager.py → hybrid_content_manager/hybridmanager.py b/hybrid-content-manager/hybridmanager.py → hybrid_content_manager/hybridmanager.py
diff --git a/hybrid-content-manager/ipycompat.py → hybrid_content_manager/ipycompat.py b/hybrid-content-manager/ipycompat.py → hybrid_content_manager/ipycompat.py
diff --git a/hybrid-content-manager/tests/__init__.py → hybrid_content_manager/tests/__init__.py b/hybrid-content-manager/tests/__init__.py → hybrid_content_manager/tests/__init__.py
diff --git a/...tent-manager/tests/test_hybrid_manager.py → ...tent_manager/tests/test_hybrid_manager.py b/...tent-manager/tests/test_hybrid_manager.py → ...tent_manager/tests/test_hybrid_manager.py
@@ -17,11 +17,11 @@
     itervalues,
 )
 from unittest import TestCase
-from unittest.mock import Mock
+from mock import Mock
 
 from IPython.utils.tempdir import TemporaryDirectory
 
-from pgcontents.hybridmanager import HybridContentsManager
+from hybrid_content_manager.hybridmanager import HybridContentsManager
 
 from .testing_utils import assertRaisesHTTPError
 

diff --git a/...id-content-manager/tests/testing_utils.py → ...id_content_manager/tests/testing_utils.py b/...id-content-manager/tests/testing_utils.py → ...id_content_manager/tests/testing_utils.py
diff --git a/notebook4_constraints.txt b/notebook4_constraints.txt
@@ -0,0 +1,2 @@
+notebook<5
+tornado<5
diff --git a/notebook5_constraints.txt b/notebook5_constraints.txt
@@ -0,0 +1 @@
+notebook<6
diff --git a/notebook6_constraints.txt b/notebook6_constraints.txt
@@ -0,0 +1 @@
+notebook<7
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,2 @@
-click>=3.3
-psycopg2>=2.6.1
-requests>=2.7.0
 six>=1.9.0
-notebook[test]>=4.0
+notebook[test]>=4.0
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,10 +1,6 @@
 # Test reqs.
 tox
-nose==1.3.4
+pytest
 python-dateutil==2.4.2
-nose-ignore-docstring==0.2
-pyflakes==0.9.2
-pep8==1.6.2
-mccabe==0.3.1
 flake8==2.2.5
 mock==2.0.0
diff --git a/setup.cfg b/setup.cfg