Skip to content

Commit 3b013ad

Browse files
authored
Merge pull request #41 from chrisjbillington/remove-conda-cruft
Remove code specific to building with setuptools_conda
2 parents 4cc1b14 + 1a28a7f commit 3b013ad

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ install_requires =
3838
setup_requires =
3939
setuptools_scm
4040

41+
[options.package_data]
42+
labscript_profile = ../labscript-suite.pth
43+
4144
[options.entry_points]
4245
console_scripts =
4346
labscript-profile-create = labscript_profile.create:create_profile
44-
45-
[dist_conda]
46-
pythons = 3.6, 3.7, 3.8

setup.py

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,9 @@
11
import os
22
from setuptools import setup
3-
from distutils import sysconfig
4-
5-
try:
6-
from setuptools_conda import dist_conda
7-
CMDCLASS = {"dist_conda": dist_conda}
8-
except ImportError:
9-
CMDCLASS = {}
10-
11-
if "CONDA_BUILD" in os.environ:
12-
# Various packaging schemes are variously unhappy with how to include the .pth file
13-
# in site-packages. Conda is happy if we specify it with data_files and an absolute
14-
# path, whereas basically everything else (pip, setup.py install, bdist,
15-
# bdist_wheel) is happy if we specify it as package_data one level up.
16-
DATA_FILES = [(sysconfig.get_python_lib(), ["labscript-suite.pth"])]
17-
PACKAGE_DATA = {}
18-
else:
19-
DATA_FILES = []
20-
PACKAGE_DATA = {"labscript_suite": [os.path.join("..", "labscript-suite.pth")]}
213

224
VERSION_SCHEME = {
235
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
246
"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
257
}
268

27-
setup(
28-
use_scm_version=VERSION_SCHEME,
29-
cmdclass=CMDCLASS,
30-
data_files=DATA_FILES,
31-
package_data=PACKAGE_DATA,
32-
)
9+
setup(use_scm_version=VERSION_SCHEME)

0 commit comments

Comments
 (0)