chore: CI

Author: thewebscraping

.github/workflows/ci.yml

@@ -11,7 +11,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
+      fail-fast: false
+      max-parallel: 3
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
@@ -23,16 +24,15 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        make init
 
     - name: Lint
       run: |
         make lint
 
     - name: Tests
       run: |
-        python -m pytest tests
+        make pytest
 
   deploy:
     needs: build

Makefile

@@ -1,5 +1,6 @@
 .PHONY: docs
 init:
+	python -m pip install --upgrade pip
 	python -m pip install -r requirements-dev.txt
 
 test:
@@ -14,6 +15,9 @@ lint:
 	python -m isort tls_requests
 	python -m flake8 tls_requests
 
+pytest:
+	python -m pytest tests
+
 coverage:
 	python -m pytest --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=tls_requests tests
 
@@ -25,11 +29,11 @@ publish-test-pypi:
 	python -m pip install 'twine>=6.0.1'
 	python setup.py sdist bdist_wheel
 	twine upload --repository testpypi dist/*
-	rm -rf build dist .egg *.egg-info
+	rm -rf build dist .egg wrapper_tls_requests.egg-info
 
 publish-pypi:
 	python -m pip install -r requirements-dev.txt
 	python -m pip install 'twine>=6.0.1'
 	python setup.py sdist bdist_wheel
 	twine upload dist/*
-	rm -rf build dist .egg *.egg-info
+	rm -rf build dist .egg wrapper_tls_requests.egg-info

tests/conftest.py

@@ -1 +1,7 @@
+import tls_requests
+
 pytest_plugins = ['pytest_httpserver', 'pytest_asyncio']
+
+
+def pytest_configure(config):
+    tls_requests.TLSLibrary.load()

tls_requests/models/libraries.py

@@ -15,8 +15,10 @@
 
 BIN_DIR = os.path.join(Path(__file__).resolve(strict=True).parent.parent / "bin")
 GITHUB_API_URL = "https://api.github.com/repos/bogdanfinn/tls-client/releases"
+OS_PLATFORM = platform
+OS_MACHINE = machine()
 PATTERN_RE = re.compile(
-    r"xgo[a-zA-Z0-9.-]+%s-%s\.(so|dll|dylib)" % (platform, machine()), re.I
+    r"[a-zA-Z0-9.-]+%s-%s\.(so|dll|dylib)" % (OS_PLATFORM, OS_MACHINE), re.I
 )
 
 
@@ -58,6 +60,7 @@ def from_kwargs(cls, **kwargs):
 class TLSLibrary:
     @classmethod
     def fetch_api(cls, version: str = None, retries: int = 3):
+
         for _ in range(retries):
             try:
                 response = requests.get(GITHUB_API_URL)
@@ -70,14 +73,16 @@ def fetch_api(cls, version: str = None, retries: int = 3):
                         asset
                         for release in releases
                         for asset in release.assets
-                        if "xgo" in str(asset.browser_download_url)
+                        if PATTERN_RE.search(asset.browser_download_url)
                     ]
                     if version is not None:
                         for asset in assets:
                             if str(version) == asset.name:
-                                return [asset.browser_download_url]
+                                yield asset.browser_download_url
+
+                    for asset in assets:
+                        yield asset.browser_download_url
 
-                    return [asset.browser_download_url for asset in assets]
             except Exception as e:
                 print("Unable to fetch GitHub API: %s" % e)
 
@@ -96,11 +101,12 @@ def find_all(cls) -> list[str]:
     @classmethod
     def download(cls, version: str = None) -> str:
         try:
+            print("System Info - Platform: %s, Machine: %s." % (OS_PLATFORM, OS_MACHINE))
             download_url = None
             for download_url in cls.fetch_api(version):
-                if PATTERN_RE.search(download_url):
-                    break
+                break
 
+            print("Download URL: %s" % download_url)
             if download_url:
                 destination = os.path.join(BIN_DIR, download_url.split("/")[-1])
                 with requests.get(download_url, stream=True) as response: