idds-monitor 2.2.19__tar.gz → 2.2.21__tar.gz

{idds_monitor-2.2.19 → idds_monitor-2.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: idds-monitor
-Version: 2.2.19
+Version: 2.2.21
 Summary: intelligent Data Delivery Service(iDDS) Package
 Author: IRIS-HEP Team
 Author-email: atlas-adc-panda@cern.ch

idds_monitor-2.2.21/data/conf.js

@@ -0,0 +1,9 @@
+
+var appConfig = {
+    'iddsAPI_request': "https://fv-az1720-841.5vs45zvnpbiehoyyevf2d3pjfe.cx.internal.cloudapp.net:443/idds/monitor_request/null/null",
+    'iddsAPI_transform': "https://fv-az1720-841.5vs45zvnpbiehoyyevf2d3pjfe.cx.internal.cloudapp.net:443/idds/monitor_transform/null/null",
+    'iddsAPI_processing': "https://fv-az1720-841.5vs45zvnpbiehoyyevf2d3pjfe.cx.internal.cloudapp.net:443/idds/monitor_processing/null/null",
+    'iddsAPI_request_detail': "https://fv-az1720-841.5vs45zvnpbiehoyyevf2d3pjfe.cx.internal.cloudapp.net:443/idds/monitor/null/null/true/false/false",
+    'iddsAPI_transform_detail': "https://fv-az1720-841.5vs45zvnpbiehoyyevf2d3pjfe.cx.internal.cloudapp.net:443/idds/monitor/null/null/false/true/false",
+    'iddsAPI_processing_detail': "https://fv-az1720-841.5vs45zvnpbiehoyyevf2d3pjfe.cx.internal.cloudapp.net:443/idds/monitor/null/null/false/false/true"
+}

{idds_monitor-2.2.19 → idds_monitor-2.2.21}/lib/idds/monitor/version.py

@@ -9,4 +9,4 @@
 # - Wen Guan, <wen.guan@cern.ch>, 2019 - 2021
 
 
-release_version = "2.2.19"
+release_version = "2.2.21"

{idds_monitor-2.2.19 → idds_monitor-2.2.21}/lib/idds_monitor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: idds-monitor
-Version: 2.2.19
+Version: 2.2.21
 Summary: intelligent Data Delivery Service(iDDS) Package
 Author: IRIS-HEP Team
 Author-email: atlas-adc-panda@cern.ch

{idds_monitor-2.2.19 → idds_monitor-2.2.21}/lib/idds_monitor.egg-info/SOURCES.txt

@@ -434,7 +434,6 @@ data/scss/widgets/feeds.scss
 data/scss/widgets/profile.scss
 data/scss/widgets/steamline.scss
 data/scss/widgets/widgets.scss
-lib/idds/__init__.py
 lib/idds/monitor/__init__.py
 lib/idds/monitor/version.py
 lib/idds_monitor.egg-info/PKG-INFO

{idds_monitor-2.2.19 → idds_monitor-2.2.21}/setup.py

@@ -16,9 +16,8 @@ import re
 import sys
 import shutil
 import socket
-from distutils.sysconfig import get_python_lib
-from setuptools import setup, find_packages, Distribution
-from setuptools.command.install import install
+import sysconfig
+from setuptools import setup, find_packages
 
 
 current_dir = os.getcwd()
@@ -34,20 +33,12 @@ with io.open('README.md', "rt", encoding="utf8") as f:
     readme = f.read()
 
 
-class OnlyGetScriptPath(install):
-    def run(self):
-        self.distribution.install_scripts = self.install_scripts
+def get_python_lib():
+    return sysconfig.get_paths()["purelib"]
 
 
 def get_python_bin_path():
-    " Get the directory setuptools installs scripts to for current python "
-    dist = Distribution({'cmdclass': {'install': OnlyGetScriptPath}})
-    dist.dry_run = True  # not sure if necessary
-    dist.parse_config_files()
-    command = dist.get_command_obj('install')
-    command.ensure_finalized()
-    command.run()
-    return dist.install_scripts
+    return sysconfig.get_paths()["scripts"]
 
 
 def get_python_home():
@@ -55,7 +46,7 @@ def get_python_home():
 
 
 def get_data_path():
-    return sys.prefix
+    return sysconfig.get_paths()["data"]
 
 
 def get_reqs_from_file(requirements_file):
@@ -128,7 +119,7 @@ install_bin_path = get_python_bin_path()
 install_home_path = get_python_home()
 install_data_path = get_data_path()
 
-requirements_files = ['tools/env/environment.yml']
+requirements_files = ['tools/monitor/env/environment.yml']
 install_requires = parse_requirements(requirements_files=requirements_files)
 install_requires = install_requires
 
@@ -139,7 +130,7 @@ data_files = [
     # config and cron files
     ('etc/idds/', glob.glob('etc/idds/*.template')),
     ('etc/idds/rest', glob.glob('etc/idds/rest/*template')),
-    ('tools/env/', glob.glob('tools/env/*.yml')),
+    ('tools/monitor/env/', glob.glob('tools/monitor/env/*.yml')),
     # ('monitor/', glob.glob('*', recursive=True))
     # ('monitor/', get_all_files('.')),
 ]
@@ -157,7 +148,7 @@ setup(
     author='IRIS-HEP Team',
     author_email='atlas-adc-panda@cern.ch',
     python_requires='>=3.6',
-    packages=find_packages('lib/'),
+    packages=find_packages('lib/', exclude=["idds"]),
     package_dir={'': 'lib'},
     install_requires=install_requires,
     include_package_data=True,

idds_monitor-2.2.19/data/conf.js

@@ -1,9 +0,0 @@
-
-var appConfig = {
-    'iddsAPI_request': "https://fv-az1042-23.0hunovngnsauvf1vw5flqwog5e.ex.internal.cloudapp.net:443/idds/monitor_request/null/null",
-    'iddsAPI_transform': "https://fv-az1042-23.0hunovngnsauvf1vw5flqwog5e.ex.internal.cloudapp.net:443/idds/monitor_transform/null/null",
-    'iddsAPI_processing': "https://fv-az1042-23.0hunovngnsauvf1vw5flqwog5e.ex.internal.cloudapp.net:443/idds/monitor_processing/null/null",
-    'iddsAPI_request_detail': "https://fv-az1042-23.0hunovngnsauvf1vw5flqwog5e.ex.internal.cloudapp.net:443/idds/monitor/null/null/true/false/false",
-    'iddsAPI_transform_detail': "https://fv-az1042-23.0hunovngnsauvf1vw5flqwog5e.ex.internal.cloudapp.net:443/idds/monitor/null/null/false/true/false",
-    'iddsAPI_processing_detail': "https://fv-az1042-23.0hunovngnsauvf1vw5flqwog5e.ex.internal.cloudapp.net:443/idds/monitor/null/null/false/false/true"
-}

idds_monitor-2.2.19/lib/idds/monitor/__init__.py

@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0OA
-#
-# Authors:
-# - Wen Guan, <wen.guan@cern.ch>, 2019