Merge branch 'main' into develop

adaptive-intelligent-robotics · Nov 28, 2023 · 6eadf8a · 6eadf8a
2 parents a63df5b + aaa3ece
commit 6eadf8a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,8 +8,8 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
-      language_version: python3.8
-      args: ["--target-version", "py38"]
+      language_version: python3.9
+      args: ["--target-version", "py39"]
 -   repo: https://github.com/PyCQA/flake8
     rev: 3.8.4
     hooks:

diff --git a/README.md b/README.md
@@ -165,11 +165,13 @@ Issues and contributions are welcome. Please refer to the [contribution guide](h
 ## Citing QDax
 If you use QDax in your research and want to cite it in your work, please use:
 ```
-@article{lim2022accelerated,
-  title={Accelerated Quality-Diversity for Robotics through Massive Parallelism},
-  author={Lim, Bryan and Allard, Maxime and Grillotti, Luca and Cully, Antoine},
-  journal={arXiv preprint arXiv:2202.01258},
-  year={2022}
+@misc{chalumeau2023qdax,
+    title={QDax: A Library for Quality-Diversity and Population-based Algorithms with Hardware Acceleration},
+    author={Felix Chalumeau and Bryan Lim and Raphael Boige and Maxime Allard and Luca Grillotti and Manon Flageat and Valentin Macé and Arthur Flajolet and Thomas Pierrot and Antoine Cully},
+    year={2023},
+    eprint={2308.03665},
+    archivePrefix={arXiv},
+    primaryClass={cs.AI}
 }
 ```
 

diff --git a/docs/installation.md b/docs/installation.md
@@ -86,7 +86,7 @@ git clone [email protected]:adaptive-intelligent-robotics/QDax.git
 
 2. Activate the environment and manually install the package qdax
     ```zsh
-    conda activate qdaxpy38
+    conda activate qdaxpy39
     pip install -e .
     ```
 

diff --git a/environment.yaml b/environment.yaml
@@ -1,9 +1,9 @@
-name: qdaxpy38
+name: qdaxpy39
 channels:
 - defaults
 - conda-forge
 dependencies:
-- python=3.8
+- python=3.9
 - pip>=20.3.3
 - conda>=4.9.2
 - pip:

diff --git a/qdax/__init__.py b/qdax/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.4"
+__version__ = "0.2.3"
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 absl-py==1.0.0
 brax==0.9.2
 chex==0.1.83
-dm-haiku==0.0.9
+dm-haiku==0.0.10
 flax==0.7.4
 gym==0.26.2
 ipython
@@ -15,5 +15,5 @@ protobuf==3.19.4
 scikit-learn==1.0.2
 scipy==1.8.0
 seaborn==0.11.2
-tensorflow-probability==0.15.0
-typing-extensions==4.3.0
+tensorflow-probability==0.19.0
+typing-extensions==4.3.0
diff --git a/tool.Dockerfile b/tool.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8.13-slim
+FROM python:3.9.18-slim
 
 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1
 ENV PIPENV_VENV_IN_PROJECT=true PIP_NO_CACHE_DIR=false PIP_DISABLE_PIP_VERSION_CHECK=1