Update to OPTIMADE Python tools v0.7.0

.github/workflows/ci.yml

@@ -110,7 +110,7 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: matrix.python-version == 3.7
-      uses: codecov/codecov-action@v1.0.5
+      uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         xml: ./coverage.xml

Dockerfile

@@ -5,7 +5,7 @@ ENV AIIDA_PATH /app
 WORKDIR /app
 
 # Install specific optimade version
-ARG OPTIMADE_TOOLS_VERSION=0.6.0
+ARG OPTIMADE_TOOLS_VERSION=0.7.0
 RUN pip install optimade==${OPTIMADE_TOOLS_VERSION}
 
 # Install specific aiida-core version

README.md

@@ -2,7 +2,7 @@
 
 | Latest release | Build status | Activity |
 |:--------------:|:------------:|:--------:|
-| [![AiiDA](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/aiidateam/aiida-optimade/master/.ci/aiida-version.json)](https://github.com/aiidateam/aiida-core/)<br>[![PyPI](https://img.shields.io/pypi/v/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![OPTiMaDe](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.6.0/.ci/optimade-version.json)](https://github.com/Materials-Consortia/OPTiMaDe/) | [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/aiidateam/aiida-optimade/aiida-optimade)](https://github.com/aiidateam/aiida-optimade/actions/)<br>[![Codecov](https://img.shields.io/codecov/c/gh/aiidateam/aiida-optimade)](https://codecov.io/gh/aiidateam/aiida-optimade) | [![GitHub last commit](https://img.shields.io/github/last-commit/aiidateam/aiida-optimade)](https://github.com/aiidateam/aiida-optimade) |
+| [![AiiDA](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/aiidateam/aiida-optimade/master/.ci/aiida-version.json)](https://github.com/aiidateam/aiida-core/)<br>[![PyPI](https://img.shields.io/pypi/v/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aiida-optimade)](https://pypi.org/project/aiida-optimade/)<br>[![OPTiMaDe](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Materials-Consortia/optimade-python-tools/v0.7.0/.ci/optimade-version.json)](https://github.com/Materials-Consortia/OPTiMaDe/) | [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/aiidateam/aiida-optimade/aiida-optimade)](https://github.com/aiidateam/aiida-optimade/actions/)<br>[![Codecov](https://img.shields.io/codecov/c/gh/aiidateam/aiida-optimade)](https://codecov.io/gh/aiidateam/aiida-optimade) | [![GitHub last commit](https://img.shields.io/github/last-commit/aiidateam/aiida-optimade)](https://github.com/aiidateam/aiida-optimade) |
 
 This is a RESTful API server created with [FastAPI](https://fastapi.tiangolo.com/) that exposes an AiiDA database according to the [OPTiMaDe specification](https://github.com/Materials-Consortia/OPTiMaDe/blob/develop/optimade.rst).
 

aiida_optimade/mappers/entries.py

@@ -1,7 +1,7 @@
 # pylint: disable=arguments-differ
 from typing import Tuple
 
-from optimade.server.mappers import ResourceMapper as OptimadeResourceMapper
+from optimade.server.mappers import BaseResourceMapper as OptimadeResourceMapper
 
 from aiida_optimade.translators.entities import AiidaEntityTranslator
 

aiida_optimade/transformers/aiida.py

@@ -254,16 +254,23 @@ def string(self, string):
         """
         return string.strip('"')
 
-    def number(self, arg):
+    @v_args(inline=True)
+    def signed_int(self, number):
+        """
+        signed_int: SIGNED_INT
+        """
+        return int(number)
+
+    @v_args(inline=True)
+    def number(self, number):
         """
         number: SIGNED_INT | SIGNED_FLOAT
         """
-        token = arg[0]
-        if token.type == "SIGNED_INT":
+        if number.type == "SIGNED_INT":
             type_ = int
-        elif token.type == "SIGNED_FLOAT":
+        elif number.type == "SIGNED_FLOAT":
             type_ = float
-        return type_(token)
+        return type_(number)
 
     def __default__(self, data, children, meta):
         raise NotImplementedError(

profiles/docker-compose.j2

@@ -7,7 +7,7 @@ services:
       context: ..
       dockerfile: Dockerfile
       args:
-        OPTIMADE_TOOLS_VERSION: 0.6.0
+        OPTIMADE_TOOLS_VERSION: 0.7.0
         AIIDA_VERSION: 1.1.1
     environment:
       AIIDA_PATH: /app

profiles/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       context: ..
       dockerfile: Dockerfile
       args:
-        OPTIMADE_TOOLS_VERSION: 0.6.0
+        OPTIMADE_TOOLS_VERSION: 0.7.0
         AIIDA_VERSION: 1.1.1
     environment:
       AIIDA_PATH: /app

setup.py

@@ -18,10 +18,10 @@
     install_requires=[
         "aiida-core~=1.1.1",
         "fastapi~=0.52",
-        "lark-parser~=0.8.1",
-        "optimade[mongo]~=0.6.0",
+        "lark-parser~=0.8.2",
+        "optimade[mongo]~=0.7.0",
         "pydantic~=1.4",
-        "uvicorn",
+        "uvicorn~=0.11.3",
     ],
     extras_require={"dev": DEV, "testing": TESTING},
     **SETUP_JSON