Merge remote-tracking branch 'upstream/next'

.github/workflows/build-docs.yml

@@ -32,4 +32,3 @@ jobs:
                 READDOCS_TOKEN: ${{ secrets.READDOCS_TOKEN }}
                 READDOCS_HOOK: ${{ secrets.READDOCS_HOOK }}
               run: curl -X POST -d "token=$READDOCS_TOKEN" $READDOCS_HOOK
-

.github/workflows/flake8-workflow.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
     env:
       FLAKE8_VERSION: "==6.1.0"
       FLAKE8_CONFIG: ".flake8"
@@ -42,4 +42,3 @@ jobs:
         if [[ ${{ env.FLAKE8_CONFIG }} != ".flake8" ]]; then rm .flake8; fi
     - name: Flake8
       run: flake8 --config ${{ env.FLAKE8_CONFIG}} pilot.py pilot/
-

.github/workflows/unit-tests.yml

@@ -11,7 +11,7 @@ jobs:
         continue-on-error: true
         strategy:
             matrix:
-                python-version: ['3.8', '3.9', '3.10', '3.11']
+                python-version: ['3.9', '3.10', '3.11']
         steps:
             - name: Checkout Pilot3 repo
               uses: actions/checkout@v3
@@ -24,4 +24,3 @@ jobs:
 
             - name: Run unit tests
               run: python -m unittest
-

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+# Run 'pre-commit run --all-files' manually if hooks are added or changed
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: check-added-large-files
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8

.pylintrc

@@ -569,4 +569,3 @@ check-str-concat-over-line-jumps=no
 # suggestions which would get split by a code formatter (e.g., black). Will
 # default to the setting for ``max-line-length``.
 max-line-length-suggestions=120
-

PILOTVERSION

@@ -1 +1 @@
-3.6.8.21
+3.7.8.21

README.md

@@ -6,7 +6,7 @@
 
 2. Fork the ``PanDAWMS/pilot3`` repository into your private account as ``origin``. Clone it and set the ``PanDAWMS/pilot3`` repository as ``upstream``.
 
-3. Make new code contributions only to a new branch in your repository, push to ``origin`` and make a pull request into ``upstream``. Depending on the type of contribution this should go to either ``upstream/next`` or ``upstream/hotfix``. 
+3. Make new code contributions only to a new branch in your repository, push to ``origin`` and make a pull request into ``upstream``. Depending on the type of contribution this should go to either ``upstream/next`` or ``upstream/hotfix``.
    Any pull requests directly to the master branch will be rejected since that would trigger the automatic pilot tarball creation.
 ## Verifying code correctness
 

__init__.py

@@ -1,8 +1,22 @@
 #!/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.0
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 # Authors:
-# - Paul Nilsson, [email protected], 2020
+# - Paul Nilsson, [email protected], 2020-23
+
+"""Default init."""

doc/Makefile

@@ -25,4 +25,3 @@ help:
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-

doc/components/api/index.rst

@@ -7,7 +7,7 @@
     http://www.apache.org/licenses/LICENSE-2.0
 
     Authors:
-     - Paul Nilsson, [email protected], 2017-2018
+     - Paul Nilsson, [email protected], 2017-2024
 
 api components
 ==============
@@ -16,7 +16,6 @@ api components
     :maxdepth: 2
 
     analytics
-    benchmark
     data
     memorymonitor
     services

doc/components/copytool/index.rst

@@ -21,4 +21,3 @@ copytool components
     mv
     rucio
     xrdcp
-

doc/components/eventservice/index.rst

@@ -20,5 +20,3 @@ eventservice components
     esmanager
     esmessage
     esprocess
-
-

doc/components/index.rst

@@ -26,6 +26,3 @@ Components
     user/index
     util/index
     workflow/index
-
-
-

doc/components/user/index.rst

@@ -17,5 +17,3 @@ user components
 
     atlas/index
     generic/index
-
-

doc/components/util/index.rst

@@ -37,6 +37,3 @@ util components
     timer
     timing
     workernode
-
-
-

doc/conf.py

@@ -1,12 +1,25 @@
 #!/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.0
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 # Authors:
 # - Daniel Drizhuk, [email protected], 2017
-
+# - Paul Nilsson, [email protected], 2023
+#
 #  -*- coding: utf-8 -*-
 #
 # Pilot 2 documentation build configuration file, created by

doc/getting_started/index.rst

@@ -15,4 +15,4 @@ Getting started
 .. toctree::
     :maxdepth: 2
 
-    launch
+    launch

doc/getting_started/launch.rst

@@ -66,12 +66,3 @@ this to `managed` while `user` is the value for user jobs. Setting it to `test`
 ``--allow_same_user``: Multi-jobs will only come from same taskID and thus same user (boolean).
 
 ``--pilot_user``: Pilot user (string). E.g. name of experiment.
-
-
-
-
-
-
-
-
-