diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 2669fa1..1036d0d 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -9,17 +9,17 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: Get newest code and run pylint steps: - name: Checkout repository uses: actions/checkout@v2 with: submodules: true - - name: Set up Python 3.6 - uses: actions/setup-python@v1 + - name: Set up Python 3.6.8 + uses: actions/setup-python@v4 with: - python-version: 3.6 + python-version: "3.6.8" - name: Install dependencies run: | python3 -m pip install --upgrade pip diff --git a/remote/cmswebwrapper.py b/remote/cmswebwrapper.py index d80ce05..fd90f8e 100644 --- a/remote/cmswebwrapper.py +++ b/remote/cmswebwrapper.py @@ -5,7 +5,6 @@ import logging import json import os -import ssl import time try: from http.client import HTTPSConnection @@ -32,15 +31,11 @@ def __get_connection(self): if self.cert_file is None or self.key_file is None: raise Exception('Missing user certificate or user key') - # BUG: HTCondor nodes are missing the latest CA certificate - # See https://cern.service-now.com/service-portal?id=outage&n=OTG0076975 - #context = ssl.create_default_context() - context = ssl._create_unverified_context() - context.load_cert_chain(self.cert_file) return HTTPSConnection('cmsweb.cern.ch', port=443, - timeout=120, - context=context) + cert_file=self.cert_file, + key_file=self.key_file, + timeout=120) def get(self, path, cache=True): """