AMR 2.1.1.9222__py3-none-any.whl → 2.1.1.9224__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- AMR/datasets.py +17 -20
- {amr-2.1.1.9222.dist-info → amr-2.1.1.9224.dist-info}/METADATA +1 -1
- amr-2.1.1.9224.dist-info/RECORD +7 -0
- amr-2.1.1.9222.dist-info/RECORD +0 -7
- {amr-2.1.1.9222.dist-info → amr-2.1.1.9224.dist-info}/WHEEL +0 -0
- {amr-2.1.1.9222.dist-info → amr-2.1.1.9224.dist-info}/top_level.txt +0 -0
AMR/datasets.py
CHANGED
|
@@ -29,26 +29,23 @@ if not isinstalled('AMR', lib_loc=r_lib_path):
|
|
|
29
29
|
print(f"AMR: Installing latest AMR R package to {r_lib_path}...", flush=True)
|
|
30
30
|
utils.install_packages('AMR', repos='https://msberends.r-universe.dev', quiet=True)
|
|
31
31
|
|
|
32
|
-
# Retrieve Python AMR version
|
|
33
|
-
try:
|
|
34
|
-
|
|
35
|
-
except metadata.PackageNotFoundError:
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
# Retrieve R AMR version
|
|
39
|
-
r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')
|
|
40
|
-
r_amr_version = str(r_amr_version[0])
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
#
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
utils.install_packages('AMR', repos='https://msberends.r-universe.dev', quiet=True)
|
|
50
|
-
except Exception as e:
|
|
51
|
-
print(f"AMR: Could not update: {e}", flush=True)
|
|
32
|
+
# # Retrieve Python AMR version
|
|
33
|
+
# try:
|
|
34
|
+
# python_amr_version = metadata.version('AMR')
|
|
35
|
+
# except metadata.PackageNotFoundError:
|
|
36
|
+
# python_amr_version = ''
|
|
37
|
+
#
|
|
38
|
+
# # Retrieve R AMR version
|
|
39
|
+
# r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')
|
|
40
|
+
# r_amr_version = str(r_amr_version[0])
|
|
41
|
+
#
|
|
42
|
+
# # Compare R and Python package versions
|
|
43
|
+
# if r_amr_version != python_amr_version:
|
|
44
|
+
# try:
|
|
45
|
+
# print(f"AMR: Updating AMR package in {r_lib_path}...", flush=True)
|
|
46
|
+
# utils.install_packages('AMR', repos='https://msberends.r-universe.dev', quiet=True)
|
|
47
|
+
# except Exception as e:
|
|
48
|
+
# print(f"AMR: Could not update: {e}", flush=True)
|
|
52
49
|
|
|
53
50
|
print(f"AMR: Setting up R environment and AMR datasets...", flush=True)
|
|
54
51
|
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
AMR/__init__.py,sha256=CqpcLv7M6mte09zdHYPzBuHJQeFAqJ4s2uN_rExYfoM,7730
|
|
2
|
+
AMR/datasets.py,sha256=d-Tq77qFwR-m5Shc2n4BfHy6GYJW5A14w_dHU_Ndtc4,2482
|
|
3
|
+
AMR/functions.py,sha256=91Tl9Jh6sbu-1xUvlst9VyQB5HJOe6ZCNhjtPpnLuik,46722
|
|
4
|
+
amr-2.1.1.9224.dist-info/METADATA,sha256=kiOxLG1Z4KiTxwi0pMjBrAh3KFOAiq871DfkvwWrAic,10095
|
|
5
|
+
amr-2.1.1.9224.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
|
|
6
|
+
amr-2.1.1.9224.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
|
|
7
|
+
amr-2.1.1.9224.dist-info/RECORD,,
|
amr-2.1.1.9222.dist-info/RECORD
DELETED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
AMR/__init__.py,sha256=CqpcLv7M6mte09zdHYPzBuHJQeFAqJ4s2uN_rExYfoM,7730
|
|
2
|
-
AMR/datasets.py,sha256=BwauDkIaXKnIrIxxMc8oa46PPnvC1FQOrr_9aMo0uwo,2496
|
|
3
|
-
AMR/functions.py,sha256=91Tl9Jh6sbu-1xUvlst9VyQB5HJOe6ZCNhjtPpnLuik,46722
|
|
4
|
-
amr-2.1.1.9222.dist-info/METADATA,sha256=7_VWyOKNs1uFKZm1-t-O7fDfENV-vAvoZRKmhv0vaDg,10095
|
|
5
|
-
amr-2.1.1.9222.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
|
|
6
|
-
amr-2.1.1.9222.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
|
|
7
|
-
amr-2.1.1.9222.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|