diff --git a/requirements-dev.txt b/requirements-dev.txt index f06314101..dd51c2d4e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,6 @@ pylint black pyopenssl -jupyter \ No newline at end of file +jupyter +codecov +ipython \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 7fc3ee409..c073727c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,30 +1,31 @@ -protobuf~=3.20 -urllib3>=1.26.3 -cloud-files>=1.25.2 +protobuf~=3.20 # 2022-06-29: Error "If this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0." requests>=2.25.0 grpcio>=1.36.1 -certifi>=2020.12.5 -cloud-volume==6.1.1 numpy pandas -networkx==2.1 +networkx>=2.1 google-cloud-bigtable>=0.33.0 -google-cloud-datastore>=1.8<=2.0dev +google-cloud-datastore>=1.8 flask flask_cors -codecov -multiwrapper python-json-logger zstandard redis rq +pyyaml +cachetools +werkzeug + +# PyPI only: +cloud-files>=1.25.2 +cloud-volume>=6.1.1 +multiwrapper middle-auth-client>=3.11.0 zmesh fastremap -pyyaml -cachetools -task-queue==1.0.0 +task-queue messagingclient -jsonschema<4.0 -importlib-metadata>=4.5.0 -dracopy<=0.0.19 +dracopy + +# Conda only - use requirements.yml (or install manually): +# graph-tool diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 000000000..ff31d789b --- /dev/null +++ b/requirements.yml @@ -0,0 +1,10 @@ +name: pychunkedgraph +channels: + - conda-forge +dependencies: + - python~=3.7 + - pip + - graph-tool-base + - uwsgi + - pip: + - -r requirements.txt \ No newline at end of file diff --git a/tox.ini b/tox.ini index 6d9a0c6bd..9da3c4150 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,13 @@ [tox] -envlist = py37dev +envlist = py310 +requires = tox-conda [testenv] setenv = HOME = {env:HOME} -usedevelop = true -sitepackages = true + deps = pytest pytest-cov pytest-mock pytest-timeout - numpy +conda_env = requirements.yml commands = python -m pytest -v {posargs} ./pychunkedgraph/tests/ -install_command = {toxinidir}/tox_install_command.sh {opts} {packages} diff --git a/tox_install_command.sh b/tox_install_command.sh deleted file mode 100755 index 4fa3935a9..000000000 --- a/tox_install_command.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -pip install pip==18.1 -pip install --process-dependency-links "$@" \ No newline at end of file