Skip to content

Commit

Permalink
Revert "Windows build failing with SSL error sgkit-dev#733"
Browse files Browse the repository at this point in the history
This reverts commit ea577ba.
  • Loading branch information
tomwhite committed Nov 15, 2021
1 parent 425e654 commit 3958200
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 33 deletions.
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Ignore VCF files during pytest collection, so it doesn't fail if cyvcf2 isn't installed.
collect_ignore_glob = ["benchmarks/*.py", "sgkit/io/vcf/*.py", ".github/scripts/*.py"]
collect_ignore_glob = ["sgkit/io/vcf/*.py", ".github/scripts/*.py"]


def pytest_configure(config) -> None: # type: ignore
Expand Down
7 changes: 0 additions & 7 deletions sgkit/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
import os

if (
os.getenv("CI") == "true" and os.getenv("RUNNER_OS") == "Windows"
): # pragma: no cover
import sgkit._windows_ssl_fix # noqa: F401 isort:skip # must be imported first to apply fix

from pkg_resources import DistributionNotFound, get_distribution

from .display import display_genotypes
Expand Down
25 changes: 0 additions & 25 deletions sgkit/_windows_ssl_fix.py

This file was deleted.

0 comments on commit 3958200

Please sign in to comment.