From e42c135e3c05b81dab0e37bf65e4b05fe8a8b546 Mon Sep 17 00:00:00 2001 From: Gregor Boehl Date: Sat, 15 Apr 2023 14:25:23 +0200 Subject: [PATCH] fix deps --- .github/workflows/continuous-integration.yml | 4 ++-- econpizza/__version__.py | 2 +- requirements.txt | 2 +- setup.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 8cb95e6..5245b17 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -42,8 +42,8 @@ jobs: python -m pip install ipykernel python -m pip install grgrlib # for development versions of grgrjax - python -m pip uninstall -y grgrjax - python -m pip install git+https://github.com/gboehl/grgrjax + #python -m pip uninstall -y grgrjax + #python -m pip install git+https://github.com/gboehl/grgrjax - name: Test with pytest run: | pytest -x diff --git a/econpizza/__version__.py b/econpizza/__version__.py index e53bd78..dd8f959 100644 --- a/econpizza/__version__.py +++ b/econpizza/__version__.py @@ -1,4 +1,4 @@ #!/bin/python # -*- coding: utf-8 -*- -__version__ = '0.5.3' +__version__ = '0.5.4' diff --git a/requirements.txt b/requirements.txt index b2b43c2..bea4589 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # ubuntu seems to have issues with jax v0.4.6. Recheck when v0.4.7 is out jax jaxlib -grgrjax>=0.4.1 +grgrjax>=0.4.3 scipy pyyaml diff --git a/setup.py b/setup.py index 5455343..be9023a 100644 --- a/setup.py +++ b/setup.py @@ -34,9 +34,9 @@ 'linear': ['grgrlib>=0.1.22'], }, install_requires=[ - "jax", - "jaxlib", - "grgrjax>=0.4.1", + "jax<0.4.6", + "jaxlib<0.4.6", + "grgrjax>=0.4.3", "pyyaml", "scipy", ],