diff --git a/requirements-http.txt b/requirements-http.txt --- a/requirements-http.txt +++ b/requirements-http.txt @@ -1,9 +1,8 @@ # requirements for swh.core.api aiohttp aiohttp_utils >= 3.1.1 -Flask +blinker # dependency of sentry-sdk[flask] +flask iso8601 msgpack >= 1.0.0 requests -blinker # dependency of sentry-sdk[flask] -types-Flask diff --git a/requirements-test-db.txt b/requirements-test-db.txt deleted file mode 100644 --- a/requirements-test-db.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/requirements-test.txt b/requirements-test.txt --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,7 +1,12 @@ -pytest -pytest-mock -requests-mock hypothesis >= 3.11.0 pre-commit +pytest +pytest-mock pytz +requests-mock +types-click +types-flask types-pytz +types-pyyaml +types-requests + diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,4 @@ -Click -Deprecated -PyYAML +click +deprecated +pyyaml sentry-sdk -types-click -types-PyYAML -types-requests diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -56,11 +56,10 @@ "testing-core": parse_requirements("test"), "logging": parse_requirements("logging"), "db": parse_requirements("db", "db-pytestplugin"), - "testing-db": parse_requirements("test-db"), "http": parse_requirements("http"), # kitchen sink, please do not use "testing": parse_requirements( - "test", "test-db", "db", "db-pytestplugin", "http", "logging" + "test", "db", "db-pytestplugin", "http", "logging" ), }, include_package_data=True, diff --git a/tox.ini b/tox.ini --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ extras = testing-core core: logging - db: db, testing-db + db: db server: http deps = cover: pytest-cov @@ -43,7 +43,6 @@ testing-core logging db - testing-db http deps = mypy @@ -60,7 +59,6 @@ testing-core logging db - testing-db http deps = # fetch and install swh-docs in develop mode @@ -83,7 +81,6 @@ testing-core logging db - testing-db http deps = # install swh-docs in develop mode