Merge pull request #590 from OpenKnowledgeMaps/renv-cleanup

Renv cleanup
OpenKnowledgeMaps · Oct 10, 2021 · f429539 · f429539
2 parents 78afefa + 06a4ef3
commit f429539
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 53 deletions.
diff --git a/server/preprocessing/other-scripts/test/params_base.json b/server/preprocessing/other-scripts/test/params_base.json
@@ -1,10 +1,9 @@
 {
   "document_types":["121"],
   "from":"1665-01-01",
-  "to":"2020-03-13",
+  "to":"2021-10-07",
   "sorting":"most-relevant",
   "lang_id":"eng",
   "vis_id": "TEST_ID",
-  "min_descsize": 300,
-  "coll": "at"
+  "min_descsize": 300
 }
diff --git a/server/workers/base/renv.lock b/server/workers/base/renv.lock
@@ -530,18 +530,6 @@
       "Source": "CRAN",
       "Hash": "c41c1a1ade8ced1887350214cec755bd"
     },
-    "ropenaire": {
-      "Package": "ropenaire",
-      "Version": "0.1.7.9210",
-      "Source": "GitHub",
-      "RemoteType": "github",
-      "RemoteHost": "api.github.com",
-      "RemoteRepo": "ropenaire",
-      "RemoteUsername": "sckott",
-      "RemoteRef": "master",
-      "RemoteSha": "64ed2560741e53b850fccd70ecf379721ca244fd",
-      "Hash": "d69c0d5e5c613f7a5e02c2622088303f"
-    },
     "rplos": {
       "Package": "rplos",
       "Version": "0.8.6",

diff --git a/server/workers/dataprocessing/renv.lock b/server/workers/dataprocessing/renv.lock
@@ -530,18 +530,6 @@
       "Source": "CRAN",
       "Hash": "c41c1a1ade8ced1887350214cec755bd"
     },
-    "ropenaire": {
-      "Package": "ropenaire",
-      "Version": "0.1.7.9210",
-      "Source": "GitHub",
-      "RemoteType": "github",
-      "RemoteHost": "api.github.com",
-      "RemoteRepo": "ropenaire",
-      "RemoteUsername": "sckott",
-      "RemoteRef": "master",
-      "RemoteSha": "64ed2560741e53b850fccd70ecf379721ca244fd",
-      "Hash": "d69c0d5e5c613f7a5e02c2622088303f"
-    },
     "rplos": {
       "Package": "rplos",
       "Version": "0.8.6",

diff --git a/server/workers/openaire/renv.lock b/server/workers/openaire/renv.lock
@@ -536,11 +536,9 @@
       "Source": "GitHub",
       "RemoteType": "github",
       "RemoteHost": "api.github.com",
-      "RemoteRepo": "ropenaire",
+      "RemoteRepo": "OpenKnowledgeMaps",
       "RemoteUsername": "sckott",
-      "RemoteRef": "master",
-      "RemoteSha": "64ed2560741e53b850fccd70ecf379721ca244fd",
-      "Hash": "d69c0d5e5c613f7a5e02c2622088303f"
+      "RemoteRef": "master"
     },
     "rplos": {
       "Package": "rplos",

diff --git a/server/workers/pubmed/renv.lock b/server/workers/pubmed/renv.lock
@@ -534,18 +534,6 @@
       "Source": "CRAN",
       "Hash": "c41c1a1ade8ced1887350214cec755bd"
     },
-    "ropenaire": {
-      "Package": "ropenaire",
-      "Version": "0.1.7.9210",
-      "Source": "GitHub",
-      "RemoteType": "github",
-      "RemoteHost": "api.github.com",
-      "RemoteRepo": "ropenaire",
-      "RemoteUsername": "sckott",
-      "RemoteRef": "master",
-      "RemoteSha": "64ed2560741e53b850fccd70ecf379721ca244fd",
-      "Hash": "d69c0d5e5c613f7a5e02c2622088303f"
-    },
     "rplos": {
       "Package": "rplos",
       "Version": "0.8.6",

diff --git a/server/workers/tests/test_helpers.py b/server/workers/tests/test_helpers.py
@@ -8,16 +8,9 @@
 from tqdm import tqdm
 
 from .conftest import RANDOM
-from ..services.src.apis.utils import get_key
-
-redis_config = {
-    "host": os.getenv("REDIS_HOST"),
-    "port": os.getenv("REDIS_PORT"),
-    "db": os.getenv("REDIS_DB"),
-    "password": os.getenv("REDIS_PASSWORD")
-}
-redis_store = redis.StrictRedis(**redis_config)
+from ..api.src.apis.utils import get_key
 
+# connect via nginx to APIs and submit tests
 
 def get_stopwords(lang):
     try:
@@ -92,7 +85,7 @@ def data_generation(KNOWNCASES, RANDOMCASES):
 
 KNOWNCASES = get_cases("knowncases")
 RANDOMCASES = get_cases("randomcases")
-TRIPLE = get_cases("triple")
+#TRIPLE = get_cases("triple")
 
 CASENAMES, CASEDATA = data_generation(KNOWNCASES, RANDOMCASES)
 CASENAMES.sort()