Merge remote-tracking branch 'upstream/master' into newDevel

* upstream/master:
  test: fix for pylint and python 2.7
  remove: old variables from setFlavour()
  Revert "master: add new command RegisterPilot"
  fix: extract DN in case of running with certificates
  feat: removed old, not-anymore-useful user_data files
  feat: added test for existance of dirac-admin-add-pilot
  feat: removed pilot switch for setting the pilotReference
  fix: pilotReference is by default
  test: added RegisterPilot command for all integration tests
  fix: moved __setFlavour method in RegisterPilots command
  feat: added command RegisterPilot

.github/workflows/basic.yml

@@ -24,8 +24,8 @@ jobs:
       matrix:
         python: 
           - 2.7.18
-          - 3.6.8
-          - 3.9.4
+          - 3.6.15
+          - 3.9.17
 
     container: python:${{ matrix.python }}-slim
     steps:
@@ -54,8 +54,8 @@ jobs:
       matrix:
         python: 
           - 2.7.18
-          - 3.6.8
-          - 3.9.4
+          - 3.6.15
+          - 3.9.17
 
     container: python:${{ matrix.python }}-slim
     steps:
@@ -77,8 +77,8 @@ jobs:
       matrix:
         python: 
           - 2.7.18
-          - 3.6.8
-          - 3.9.4
+          - 3.6.15
+          - 3.9.17
 
     container: python:${{ matrix.python }}-slim
     steps:

environment.yml

@@ -1,7 +1,6 @@
 name: pilot-development
 
 channels:
-  - diracgrid
   - conda-forge
   - defaults