Merge branch 'master' into ml-evs/add_configurable_schema_url

Materials-Consortia · Jun 9, 2022 · 6bd9f23 · 6bd9f23
2 parents 40d7c22 + 1f02600
commit 6bd9f23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -41,8 +41,8 @@ All contributed Python code, must use the [black](https://github.com/ambv/black)
 git clone --recursive git@github.com:Materials-Consortia/optimade-python-tools.git
 cd optimade-python-tools
 
-# Ensure a Python>=3.7 (virtual) environment (example below using Anaconda/Miniconda)
-conda create -n optimade python=3.7
+# Ensure a Python>=3.8 (virtual) environment (example below using Anaconda/Miniconda)
+conda create -n optimade python=3.10
 conda activate optimade
 
 # Install package and dependencies in editable mode (including "dev" requirements).

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 elasticsearch-dsl==6.4.0
 email_validator==1.2.1
 fastapi==0.78.0
-lark-parser==0.12.0
+lark==0.12.0
 mongomock==4.0.0
 pydantic==1.9.1
 pymongo==4.1.1

diff --git a/setup.py b/setup.py
@@ -64,6 +64,7 @@
     + docs_deps
     + testing_deps
     + client_deps
+    + http_client_deps
 )
 all_deps = (
     dev_deps
@@ -102,7 +103,7 @@
     ],
     python_requires=">=3.7,<3.11",
     install_requires=[
-        "lark-parser~=0.12",
+        "lark~=0.12",
         "fastapi~=0.65",
         "pydantic~=1.9",
         "email_validator~=1.2",