From 7e20a14a2ec3a04e3db23e12f8453ef82ae9659a Mon Sep 17 00:00:00 2001 From: Chris Wood Date: Fri, 4 Oct 2019 11:59:33 -0400 Subject: [PATCH] Remove fix; temporarily break PyInstaller builds.. For the purposes of fail-testing the newly-added PyInstaller CI jobs --- src/allmydata/version_checks.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/allmydata/version_checks.py b/src/allmydata/version_checks.py index 9f084ff4b..761d6b6ea 100644 --- a/src/allmydata/version_checks.py +++ b/src/allmydata/version_checks.py @@ -23,21 +23,11 @@ from .util import ( verlib, ) -if getattr(sys, 'frozen', None): - # "Frozen" python interpreters (i.e., standalone executables - # generated by PyInstaller and other, similar utilities) run - # independently of a traditional setuptools-based packaging - # environment, and so pkg_resources.get_distribution() cannot be - # used in such cases to gather a list of requirements at runtime - # (and because a frozen application is one that has already been - # "installed", an empty list suffices here). - _INSTALL_REQUIRES = [] -else: - _INSTALL_REQUIRES = list( - str(req) - for req - in pkg_resources.get_distribution(__appname__).requires() - ) +_INSTALL_REQUIRES = list( + str(req) + for req + in pkg_resources.get_distribution(__appname__).requires() +) class PackagingError(EnvironmentError): """