Skip to content

Commit 841794c

Browse files
authored
Merge pull request #508 from HSF/dev
Dev
2 parents 118848b + b2969e6 commit 841794c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4913
-1126
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[flake8]
22
max-line-length=256
3-
ignore=E731,E722
3+
ignore=E731,E722,W503

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ build/
4040

4141
idds.wsgi
4242
*conf.install_template
43+
44+
prompt.back

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN yum-config-manager --enable crb
2828
# RUN yum install -y httpd.x86_64 conda gridsite mod_ssl.x86_64 httpd-devel.x86_64 gcc.x86_64 supervisor.noarch fetch-crl.noarch lcg-CA postgresql postgresql-contrib postgresql-static postgresql-libs postgresql-devel && \
2929
# yum clean all && \
3030
# rm -rf /var/cache/yum
31-
RUN yum install -y httpd.x86_64 which conda gridsite mod_ssl.x86_64 httpd-devel.x86_64 gcc.x86_64 supervisor.noarch fetch-crl.noarch redis syslog-ng procps passwd which systemd-udev wget voms-clients-java voms-clients-cpp && \
31+
RUN yum install -y httpd.x86_64 which conda gridsite mod_ssl.x86_64 httpd-devel.x86_64 gcc.x86_64 supervisor.noarch fetch-crl.noarch redis syslog-ng procps passwd which systemd-udev wget voms-clients-java voms-clients-cpp cachetools && \
3232
yum clean all && \
3333
rm -rf /var/cache/yum
3434

atlas/lib/idds/atlas/processing/stagein_poller.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def create_new_rule(self, rule, dids, dest_rse, src_rse=None):
9797
if not src_rse:
9898
old_src_rse = rule['source_replica_expression']
9999
if old_src_rse:
100-
src_rse = "*\(%s)" % old_src_rse # noqa: W605
100+
# Use a raw string to avoid SyntaxWarning for invalid escape sequences
101+
src_rse = r"*\(%s)" % old_src_rse # noqa: W605
101102
self.logger.info("Creating new rule for dataset %s:%s, src_rse_expression: %s" % (dataset_scope, dataset_name, src_rse))
102103

103104
rule_id = self.plugins['rule_creator'](dataset_scope=dataset_scope,

common/lib/idds/common/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class Sections:
3434
Cache = 'cache'
3535
Archiver = 'archiver'
3636
Coordinator = 'coordinator'
37+
Prompt = 'prompt'
3738
Rest = 'rest'
3839

3940

0 commit comments

Comments
 (0)