Dependencies: require python 3.9. Closes rucio#6251

stfc · Jul 20, 2023 · 70ccd56 · 70ccd56
1 parent 90d2ea6
commit 70ccd56
Show file tree

Hide file tree

Showing 22 changed files with 71 additions and 679 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Use rucio/containers Dockerfile for integration tests
         shell: bash
         run: |
-          sed -i 's;RUN git clone .*;COPY ./rucio /tmp/rucio;' $GITHUB_WORKSPACE/dev/Dockerfile
+          sed -i 's;RUN git clone .*;COPY ./rucio /tmp/rucio;' $GITHUB_WORKSPACE/dev/alma9.Dockerfile
       - name: Build rucio-dev images
         id: images
         shell: bash

diff --git a/bin/rucio-admin b/bin/rucio-admin
@@ -1341,10 +1341,8 @@ def get_parser():
     """
     oparser = argparse.ArgumentParser(prog=os.path.basename(sys.argv[0]), add_help=True)
 
-    required_arg = {}
-    if sys.version_info >= (3, 7):
-        # required argument was added in Python 3.7 and restores the Python 2 behavior
-        required_arg = {'required': True}
+    # required argument was added in Python 3.7 and restores the Python 2 behavior
+    required_arg = {'required': True}
 
     subparsers = oparser.add_subparsers(dest='subcommand', **required_arg)
 

diff --git a/etc/docker/dev/docker-compose-storage-alldb.yml b/etc/docker/dev/docker-compose-storage-alldb.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   rucioclient:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     command: ["sleep", "infinity"]
     volumes:
       - ../../certs/rucio_ca.pem:/etc/grid-security/certificates/5fca1cb1.0:z
@@ -20,7 +20,7 @@ services:
       - X509_USER_KEY=/opt/rucio/etc/userkey.pem
       - RDBMS=postgres14
   rucio:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     ports:
       - "127.0.0.1:8443:443"
     volumes:

diff --git a/etc/docker/dev/docker-compose-storage-externalmetadata.yml b/etc/docker/dev/docker-compose-storage-externalmetadata.yml
@@ -1,7 +1,7 @@
 version: "3.5"
 services:
   rucioclient:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     command: ["sleep", "infinity"]
     volumes:
       - ../../certs/rucio_ca.pem:/etc/grid-security/certificates/5fca1cb1.0:z
@@ -20,7 +20,7 @@ services:
       - X509_USER_KEY=/opt/rucio/etc/userkey.pem
       - RDBMS=postgres14
   rucio:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     ports:
       - "127.0.0.1:8443:443"
     volumes:

diff --git a/etc/docker/dev/docker-compose-storage-monit.yml b/etc/docker/dev/docker-compose-storage-monit.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   rucioclient:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     command: ["sleep", "infinity"]
     volumes:
       - ../../certs/rucio_ca.pem:/etc/grid-security/certificates/5fca1cb1.0:z
@@ -20,7 +20,7 @@ services:
       - X509_USER_KEY=/opt/rucio/etc/userkey.pem
       - RDBMS=postgres14
   rucio:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     ports:
       - "127.0.0.1:8443:443"
     volumes:

diff --git a/etc/docker/dev/docker-compose-storage.yml b/etc/docker/dev/docker-compose-storage.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   rucioclient:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     command: ["sleep", "infinity"]
     volumes:
       - ../../certs/rucio_ca.pem:/etc/grid-security/certificates/5fca1cb1.0:z
@@ -20,7 +20,7 @@ services:
       - X509_USER_KEY=/opt/rucio/etc/userkey.pem
       - RDBMS=postgres14
   rucio:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     ports:
       - "127.0.0.1:8443:443"
     volumes:

diff --git a/etc/docker/dev/docker-compose.yml b/etc/docker/dev/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   rucioclient:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     command: ["sleep", "infinity"]
     volumes:
       - ../../certs/rucio_ca.pem:/etc/grid-security/certificates/5fca1cb1.0:z
@@ -20,7 +20,7 @@ services:
       - X509_USER_KEY=/opt/rucio/etc/userkey.pem
       - RDBMS=postgres14
   rucio:
-    image: docker.io/rucio/rucio-dev
+    image: docker.io/rucio/rucio-dev:latest-alma9
     ports:
       - "127.0.0.1:8443:443"
     volumes:

diff --git a/etc/docker/test/alma8.Dockerfile b/etc/docker/test/alma8.Dockerfile
diff --git a/etc/docker/test/centos7.Dockerfile b/etc/docker/test/centos7.Dockerfile