Merge branches 'non-universal-wheel' and 'rm-pypi-config' into develop

voxel51 · Aug 3, 2020 · d8e1fe0 · d8e1fe0
3 parents 27059f1 + c015a33 + b9661a7
commit d8e1fe0
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 145 deletions.
diff --git a/package/pypi-server/local/.env.sample b/package/pypi-server/local/.env.sample
diff --git a/package/pypi-server/local/.gitignore b/package/pypi-server/local/.gitignore
diff --git a/package/pypi-server/local/docker-compose.yaml b/package/pypi-server/local/docker-compose.yaml
diff --git a/package/pypi-server/local/packages/.gitignore b/package/pypi-server/local/packages/.gitignore
diff --git a/package/pypi-server/prod/.env b/package/pypi-server/prod/.env
diff --git a/package/pypi-server/prod/.gitignore b/package/pypi-server/prod/.gitignore
diff --git a/package/pypi-server/prod/README.md b/package/pypi-server/prod/README.md
diff --git a/package/pypi-server/prod/add-user.bash b/package/pypi-server/prod/add-user.bash
diff --git a/package/pypi-server/prod/docker-compose.yaml b/package/pypi-server/prod/docker-compose.yaml
diff --git a/package/pypi-server/prod/pypi.voxel51.com.conf b/package/pypi-server/prod/pypi.voxel51.com.conf
diff --git a/package/pypi-server/prod/server-setup.bash b/package/pypi-server/prod/server-setup.bash
diff --git a/setup.py b/setup.py
@@ -13,8 +13,6 @@
 class BdistWheelCustom(bdist_wheel):
     def finalize_options(self):
         bdist_wheel.finalize_options(self)
-        # pure Python, so build a wheel for any Python version
-        self.universal = True
         # make just the wheel require these packages, since they aren't needed
         # for a development installation
         self.distribution.install_requires += [