diff --git a/Dockerfile b/Dockerfile index 8acfb10..deb9e4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN pip install --no-cache-dir \ ARG WORKSPACE=/home/dgp WORKDIR ${WORKSPACE} COPY requirements.txt requirements-dev.txt /tmp/ -RUN pip install --no-cache-dir cython==0.29.21 numpy==1.19.4 +RUN pip install --no-cache-dir cython==0.29.30 numpy==1.20.3 RUN pip install --no-cache-dir -r /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements-dev.txt diff --git a/Makefile b/Makefile index fa86bd3..fda0f75 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ clean: find dgp/contribs/pd -name "*_pb2.py" | xargs rm -rf develop: - pip install cython==0.29.21 numpy==1.19.4 grpcio==1.41.0 grpcio-tools==1.41.0 + pip install cython==0.29.30 numpy==1.20.3 grpcio==1.41.0 grpcio-tools==1.41.0 pip install --editable . docker-build: @@ -83,7 +83,7 @@ setup-linters: pre-commit install pre-commit install --hook-type commit-msg -test: clean build-proto +test: build-proto PYTHONPATH=$(PWD):$(PYTHONPATH) \ $(UNITTEST) $(UNITTEST_OPTS) $(PWD)/tests/ diff --git a/docs/VIRTUAL_ENV.md b/docs/VIRTUAL_ENV.md index 93cc273..c98525a 100644 --- a/docs/VIRTUAL_ENV.md +++ b/docs/VIRTUAL_ENV.md @@ -22,7 +22,7 @@ DGP. ```sh dgp$ pip install --upgrade pip -dgp$ pip install cython==0.29.21 numpy==1.19.4 +dgp$ pip install cython==0.29.30 numpy==1.20.3 dgp$ pip install -r requirements.txt -r requirements-dev.txt ``` diff --git a/requirements.txt b/requirements.txt index 7f16dad..f6eafce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,5 @@ torch>=1.8.1 torchvision>=0.9.1 tqdm>=4.29.1 tenacity>=6.0.0 -xarray==2022.6.0 +xarray>=2022.6.0 +numpy>=1.20.3 diff --git a/setup.py b/setup.py index b01ffc7..a20c81f 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ def run(self): 'dgp_cli=dgp.cli:cli', ]}, include_package_data=True, - setup_requires=['cython==0.29.21', 'grpcio==1.41.0', 'grpcio-tools==1.41.0'], + setup_requires=['cython==0.29.30', 'grpcio==1.41.0', 'grpcio-tools==1.41.0'], install_requires=requirements, extras_require={'dev': requirements_dev}, zip_safe=False,