Skip to content

Commit 4169d9a

Browse files
tomwhitemergify[bot]
authored andcommitted
Revert "Windows build failing with SSL error #733"
This reverts commit ea577ba.
1 parent 41ebba0 commit 4169d9a

File tree

3 files changed

+1
-33
lines changed

3 files changed

+1
-33
lines changed

conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Ignore VCF files during pytest collection, so it doesn't fail if cyvcf2 isn't installed.
2-
collect_ignore_glob = ["benchmarks/*.py", "sgkit/io/vcf/*.py", ".github/scripts/*.py"]
2+
collect_ignore_glob = ["sgkit/io/vcf/*.py", ".github/scripts/*.py"]
33

44

55
def pytest_configure(config) -> None: # type: ignore

sgkit/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
import os
2-
3-
if (
4-
os.getenv("CI") == "true" and os.getenv("RUNNER_OS") == "Windows"
5-
): # pragma: no cover
6-
import sgkit._windows_ssl_fix # noqa: F401 isort:skip # must be imported first to apply fix
7-
81
from pkg_resources import DistributionNotFound, get_distribution
92

103
from .display import display_genotypes

sgkit/_windows_ssl_fix.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)