Merge pull request #266 from CSCfi/dev

release 1.6.5

.github/workflows/dependabot-auto-merge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.5
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Wait other jobs are passed or failed

.github/workflows/int.yml

@@ -65,7 +65,7 @@ jobs:
           sleep 30
           
       - name: Build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true

aggregator/utils/utils.py

@@ -255,7 +255,6 @@ async def find_query_endpoint(service, params):
                 if raw_data.get("searchInInput") in endpoint[0]:
                     if raw_data.get("id") != "0" and raw_data.get("id") is not None:
                         if raw_data.get("searchByInput") != "" and raw_data.get("searchByInput") is not None:
-
                             url = list(endpoint)
                             url[0] += "/" + raw_data.get("id") + "/" + raw_data.get("searchByInput")
                             endpoint = tuple(url)

docs/examples.rst

@@ -280,7 +280,7 @@ Response
             "updatedAt": "2019-08-02 00:00:13.006256+00:00",
             "contactUrl": "https://www.csc.fi/contact-info",
             "environment": "dev",
-            "version": "1.6.4",
+            "version": "1.6.5",
             "url": "https://staging-elixirbeacon.rahtiapp.fi/"
         },
         {
@@ -301,7 +301,7 @@ Response
             "updatedAt": "2019-08-02 00:00:13.016122+00:00",
             "contactUrl": "https://www.csc.fi/contact-info",
             "environment": "prod",
-            "version": "1.6.4",
+            "version": "1.6.5",
             "url": "https://staging-elixirbeacon.rahtiapp.fi/"
         },
         {
@@ -362,7 +362,7 @@ Response
         "updatedAt": "2019-08-02 00:00:13.006256+00:00",
         "contactUrl": "https://www.csc.fi/contact-info",
         "environment": "dev",
-        "version": "1.6.4",
+        "version": "1.6.5",
         "url": "https://staging-elixirbeacon.rahtiapp.fi/"
     }
 

requirements.txt

@@ -1,8 +1,8 @@
 asyncio==3.4.3
-aiohttp==3.8.3
+aiohttp==3.8.4
 aiohttp-cors==0.7.0
-aiocache==0.11.1
-aiomcache==0.8.0
+aiocache==0.12.0
+aiomcache==0.8.1
 ujson==5.7.0
 uvloop==0.14.0; python_version < '3.7'
 uvloop==0.17.0; python_version >= '3.7'

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="beacon_network",
-    version="1.6.4",
+    version="1.6.5",
     description="Beacon Network services",
     long_description_content_type="text/markdown",
     project_urls={
@@ -30,10 +30,10 @@
     package_data={"": ["*.json", "*.ini"]},
     install_requires=[
         "asyncio==3.4.3",
-        "aiohttp==3.8.3",
+        "aiohttp==3.8.4",
         "aiohttp-cors==0.7.0",
-        "aiocache==0.11.1",
-        "aiomcache==0.8.0",
+        "aiocache==0.12.0",
+        "aiomcache==0.8.1",
         "ujson==5.7.0",
         "uvloop==0.14.0; python_version < '3.7'",
         "uvloop==0.17.0; python_version >= '3.7'",
@@ -43,20 +43,23 @@
     ],
     extras_require={
         "test": [
-            "coverage==7.0.4",
+            "coverage==7.1.0",
             "pytest<7.3",
             "pytest-cov==4.0.0",
-            "testfixtures==7.0.4",
-            "tox==4.2.6",
+            "testfixtures==7.1.0",
+            "tox==4.4.5",
             "flake8==6.0.0",
-            "flake8-docstrings==1.6.0",
+            "flake8-docstrings==1.7.0",
             "asynctest==0.13.0",
             "aioresponses==0.7.4",
-            "black==22.12.0",
+            "black==23.1.0",
         ],
-        "docs": ["sphinx >= 1.4", "sphinx_rtd_theme==1.1.1"],
+        "docs": ["sphinx >= 1.4", "sphinx_rtd_theme==1.2.0"],
     },
     entry_points={
-        "console_scripts": ["beacon_registry=registry.registry:main", "beacon_aggregator=aggregator.aggregator:main"],
+        "console_scripts": [
+            "beacon_registry=registry.registry:main",
+            "beacon_aggregator=aggregator.aggregator:main",
+        ],
     },
 )

tests/integration/run_tests.py

@@ -35,7 +35,6 @@ async def test_get_services(endpoint, expected_nb, expected_beacon, version):
         data = response.json()
         assert len(data) == expected_nb, "We did not find the expected number of services"
         if version == 1:
-
             assert re.search(f'"id":"{expected_beacon}"', ujson.dumps(data, escape_forward_slashes=False), re.M), "We did not find the expected beacon"
 
         # we don't fail this test as running on localhost this might be problematic