Skip to content

Commit

Permalink
Feature 5618 Resolve the pre-commit problems (rucio#5619)
Browse files Browse the repository at this point in the history
* Documentation: Fix the trailing whitespaces rucio#5618

It is a good practice to remove trailing whitespaces from the
files. They can not be spottet in most editors, and they add no
value. This commit removes all trailing whitespaces from the repository.

The pre-commit hook `trailing-whitespaces` takes care of trailing
white-spaces before the commit. This is a desired behavior.

* Documentation: Fix the file endings rucio#5618

It is a good practice to remove empty lines from the files. They can not
be spottet in most editors, and they add no value. This commit removes
all unnecessary empty lines on the end of files from the repository.

The pre-commit hook `end-of-file-fixer` takes care of empty lines on the
end of files before the commit. This is a desired behavior.

There, however, is the `ISSUETEMPLATE.md` file, where the behavior is
desired. We do not change that one.
  • Loading branch information
joeldierkes authored Jun 9, 2022
1 parent 0de031f commit 2f60939
Show file tree
Hide file tree
Showing 74 changed files with 1,981 additions and 1,999 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build-images-and-run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inputs:
branch:
required: true

runs:
runs:
using: composite
steps:
- name: Build images
Expand All @@ -33,4 +33,4 @@ runs:
echo "::set-output name=images::$IMAGES"
- name: Run test with cfg
shell: bash
run: 'echo ''{"matrix": ${{ inputs.cfg }}, "images": ${{ steps.images.outputs.images }} }'' | ./tools/test/run_tests.py'
run: 'echo ''{"matrix": ${{ inputs.cfg }}, "images": ${{ steps.images.outputs.images }} }'' | ./tools/test/run_tests.py'
14 changes: 7 additions & 7 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ jobs:
fetch-depth: 0
- name: Select tag for rucio containers
shell: bash
run: |
run: |
# Change to cloned rucio/rucio repo
cd $GITHUB_WORKSPACE/dev/rucio
# Get current branch and corresponding latest tag in rucio/rucio repo
BRANCH=$(git rev-parse --abbrev-ref HEAD)
OWNER="${{ github.repository_owner }}"
if [ $OWNER != 'rucio' ]; then
echo "The workflow is running in user ${OWNER}'s fork. Fetching branches and tags from rucio/rucio instead."
git remote add rucio https://github.com/rucio/rucio
Expand All @@ -67,11 +67,11 @@ jobs:
RELEASE_FAMILY=$major.$minor
LATEST_RELEASE_IN_RELEASE_FAMILY=$(git for-each-ref --format '%(refname)' refs/tags/$RELEASE_FAMILY.* | sort -k 1.11V | tail -1 | awk -F'/' '{print $3}')
LATEST_RUCIO_RELEASE_FAMILY=$(git for-each-ref --format '%(refname)' refs/tags | sort -k 1.11V | tail -1 | awk -F'/' '{print $3}' | awk -F'.' '{print $1 "." $2}')
echo "Release line for ${BRANCH} is ${RELEASE_FAMILY}"
echo "Release line for ${BRANCH} is ${RELEASE_FAMILY}"
echo "The latest release line for rucio is ${LATEST_RUCIO_RELEASE_FAMILY}"
echo "The latest release in ${RELEASE_FAMILY} is ${LATEST_RELEASE_IN_RELEASE_FAMILY}"
if [ $LATEST_RUCIO_RELEASE_FAMILY = $RELEASE_FAMILY ]; then
GIT_REF='master' # always use containers/master when working on latest rucio/rucio release line
else
Expand All @@ -82,7 +82,7 @@ jobs:
cd $GITHUB_WORKSPACE
# Check if rucio/containers has a corresponding $GIT_REF
# Check if rucio/containers has a corresponding $GIT_REF
if [ $(git tag -l "$GIT_REF") ]; then
git checkout tags/$GIT_REF
else
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,3 @@ tools/test.file.1G

# autotest logs/data
/.autotest

1 change: 0 additions & 1 deletion .pep8
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[pep8]
max-line-length=256
ignore=E731,E722

1 change: 0 additions & 1 deletion .pycodestyle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[pycodestyle]
max-line-length=256
ignore=E731,E722

1 change: 0 additions & 1 deletion etc/docker/dev/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,3 @@ And if we look at the replicas of the dataset, we see the there are replicas of
> | test | file4 | 10.486 MB | 65786e49 | XRD2: root://xrd2:1095//rucio/test/2b/c2/file4 |
> | test | file4 | 10.486 MB | 65786e49 | XRD3: root://xrd3:1096//rucio/test/2b/c2/file4 |
> +---------+--------+------------+-----------+------------------------------------------------+

26 changes: 13 additions & 13 deletions etc/docker/test/extra/httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions.
# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
# In particular, see
# In particular, see
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
# for a discussion of each configuration directive.
#
# Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure
# consult the online docs. You have been warned.
# consult the online docs. You have been warned.
#
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
Expand All @@ -35,7 +35,7 @@ ServerRoot "/etc/httpd"
# ports, instead of the default. See also the <VirtualHost>
# directive.
#
# Change this to Listen on specific IP addresses as shown below to
# Change this to Listen on specific IP addresses as shown below to
# prevent Apache from glomming onto all bound IP addresses.
#
#Listen 12.34.56.78:80
Expand All @@ -57,7 +57,7 @@ Include conf.modules.d/*.conf

#
# If you wish httpd to run as a different user or group, you must run
# httpd as root initially and it will switch.
# httpd as root initially and it will switch.
#
# User/Group: The name (or #number) of the user/group to run httpd as.
# It is usually good practice to create a dedicated user and group for
Expand Down Expand Up @@ -96,7 +96,7 @@ ServerAdmin root@localhost

#
# Deny access to the entirety of your server's filesystem. You must
# explicitly permit access to web content directories in other
# explicitly permit access to web content directories in other
# <Directory> blocks below.
#
<Directory />
Expand Down Expand Up @@ -166,8 +166,8 @@ DocumentRoot "/var/www/html"
</IfModule>

#
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
<Files ".ht*">
Require all denied
Expand Down Expand Up @@ -220,8 +220,8 @@ LogLevel warn

<IfModule alias_module>
#
# Redirect: Allows you to tell clients about documents that used to
# exist in your server's namespace, but do not anymore. The client
# Redirect: Allows you to tell clients about documents that used to
# exist in your server's namespace, but do not anymore. The client
# will make a new request for the document at its new location.
# Example:
# Redirect permanent /foo http://www.example.com/bar
Expand All @@ -238,7 +238,7 @@ LogLevel warn
# the filesystem path.

#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
# documents in the target directory are treated as applications and
# run by the server when requested rather than as documents sent to the
Expand Down Expand Up @@ -309,7 +309,7 @@ LogLevel warn

#
# Specify a default charset for all content served; this enables
# interpretation of all content as UTF-8 by default. To use the
# interpretation of all content as UTF-8 by default. To use the
# default browser choice (ISO-8859-1), or to allow the META tags
# in HTML content to override this choice, comment out this
# directive:
Expand Down Expand Up @@ -337,10 +337,10 @@ AddDefaultCharset UTF-8
#

#
# EnableMMAP and EnableSendfile: On systems that support it,
# EnableMMAP and EnableSendfile: On systems that support it,
# memory-mapping or the sendfile syscall may be used to deliver
# files. This usually improves server performance, but must
# be turned off when serving from networked-mounted
# be turned off when serving from networked-mounted
# filesystems or if support for these functions is otherwise
# broken on your system.
# Defaults if commented: EnableMMAP On, EnableSendfile Off
Expand Down
Loading

0 comments on commit 2f60939

Please sign in to comment.