Skip to content

Commit

Permalink
Merge pull request #107 from PanDAWMS/next
Browse files Browse the repository at this point in the history
3.7.0.36
  • Loading branch information
PalNilsson authored Nov 6, 2023
2 parents 78c3011 + 7f2af70 commit 4b0b372
Show file tree
Hide file tree
Showing 224 changed files with 5,273 additions and 2,336 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion PILOTVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.6.9.10
3.7.0.36
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 19 additions & 5 deletions __init__.py
Original file line number Diff line number Diff line change
@@ -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."""
1 change: 0 additions & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ help:
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

1 change: 0 additions & 1 deletion doc/components/copytool/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ copytool components
mv
rucio
xrdcp

2 changes: 0 additions & 2 deletions doc/components/eventservice/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@ eventservice components
esmanager
esmessage
esprocess


3 changes: 0 additions & 3 deletions doc/components/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,3 @@ Components
user/index
util/index
workflow/index



2 changes: 0 additions & 2 deletions doc/components/user/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ user components

atlas/index
generic/index


3 changes: 0 additions & 3 deletions doc/components/util/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,3 @@ util components
timer
timing
workernode



23 changes: 18 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/getting_started/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Getting started
.. toctree::
:maxdepth: 2

launch
launch
9 changes: 0 additions & 9 deletions doc/getting_started/launch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.









Loading

0 comments on commit 4b0b372

Please sign in to comment.