Browse Source

fix: sentry now installs via pep517-enabled pip (#16184)

josh 5 years ago
parent
commit
19bd0abd70
4 changed files with 2 additions and 4 deletions
  1. 0 1
      .travis.yml
  2. 1 1
      Makefile
  3. 0 1
      docker/Dockerfile
  4. 1 1
      setup.py

+ 0 - 1
.travis.yml

@@ -28,7 +28,6 @@ env:
     # PIP_VERSION causes issues because: https://github.com/pypa/pip/issues/4528
     # Note: this has to be synced with the pip version in the Makefile.
     - PYTHON_PIP_VERSION=19.2.3
-    - PIP_USE_PEP517=off
     - PIP_DISABLE_PIP_VERSION_CHECK=on
     - PIP_QUIET=1
     - SENTRY_LIGHT_BUILD=1

+ 1 - 1
Makefile

@@ -10,7 +10,7 @@ endif
 PIP := LDFLAGS="$(LDFLAGS)" python -m pip
 # Note: this has to be synced with the pip version in .travis.yml.
 PIP_VERSION := 19.2.3
-PIP_OPTS := --no-use-pep517 --disable-pip-version-check
+PIP_OPTS := --disable-pip-version-check
 WEBPACK := NODE_ENV=production ./bin/yarn webpack
 YARN := ./bin/yarn
 

+ 0 - 1
docker/Dockerfile

@@ -101,7 +101,6 @@ COPY --from=sdist /usr/local/bin/gosu /usr/local/bin/tini /usr/local/bin/
 # Sane defaults for pip
 ENV PIP_NO_CACHE_DIR=off \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PIP_USE_PEP517=off \
     # Sentry config params
     SENTRY_CONF=/etc/sentry \
     SENTRY_FILESTORE_DIR=/var/lib/sentry/files \

+ 1 - 1
setup.py

@@ -14,7 +14,7 @@ from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist as SDistCommand
 from setuptools.command.develop import develop as DevelopCommand
 
-ROOT = os.path.realpath(os.path.join(os.path.dirname(sys.modules["__main__"].__file__)))
+ROOT = os.path.dirname(os.path.abspath(__file__))
 
 # add sentry to path so we can import distutils
 # XXX: consequentially, this means sentry must be pip installed with --no-use-pep517