Skip to content

Commit

Permalink
Merge branch 'drop-py27-wheels' into 'master'
Browse files Browse the repository at this point in the history
Drop Python 2.7 wheels

See merge request lscsoft/lalsuite!1302
  • Loading branch information
skymoo committed May 5, 2020
2 parents fc32a56 + 34cdd90 commit bbb2097
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
14 changes: 1 addition & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,7 @@ platform:macos:sierra:
- source env/bin/activate
- python -m pip install
git+https://github.com/lpsinger/delocate@fix-duplicate-libs
glob2
'numpy==1.7.0;python_version<"3.7"'
'numpy==1.14.5;python_version=="3.7"'
'numpy==1.17.3;python_version=="3.8"'
oldest-supported-numpy
# Build wheel
- ./00boot
- ./configure PYTHON=$(which python${PYVERS}) --enable-mpi --enable-swig-python ${EXTRA_CONFIG_FLAGS} LDFLAGS=-Wl,-headerpad_max_install_names
Expand Down Expand Up @@ -1026,10 +1023,6 @@ platform:macos:sierra:
image: containers.ligo.org/lscsoft/lalsuite-manylinux/manylinux2014_x86_64

# Build wheels for all supported platforms
wheel:cp27-cp27m-manylinux1:
<<: *wheel-manylinux1
wheel:cp27-cp27mu-manylinux1:
<<: *wheel-manylinux1
wheel:cp35-cp35m-manylinux1:
<<: *wheel-manylinux1
wheel:cp36-cp36m-manylinux1:
Expand All @@ -1046,8 +1039,6 @@ wheel:cp37-cp37m-manylinux2014:
<<: *wheel-manylinux2014
wheel:cp38-cp38-manylinux2014:
<<: *wheel-manylinux2014
wheel:cp27-cp27m-macosx:
<<: *wheel-macos
wheel:cp35-cp35m-macosx:
<<: *wheel-macos
wheel:cp36-cp36m-macosx:
Expand All @@ -1069,8 +1060,6 @@ deploy:wheel:
- pip install twine
- twine upload wheelhouse/*
needs:
- wheel:cp27-cp27m-manylinux1
- wheel:cp27-cp27mu-manylinux1
- wheel:cp35-cp35m-manylinux1
- wheel:cp36-cp36m-manylinux1
- wheel:cp37-cp37m-manylinux1
Expand All @@ -1079,7 +1068,6 @@ deploy:wheel:
- wheel:cp36-cp36m-manylinux2014
- wheel:cp37-cp37m-manylinux2014
- wheel:cp38-cp38-manylinux2014
- wheel:cp27-cp27m-macosx
- wheel:cp35-cp35m-macosx
- wheel:cp36-cp36m-macosx
- wheel:cp37-cp37m-macosx
Expand Down
11 changes: 4 additions & 7 deletions wheel/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ To install, simply run::
$ pip install lalsuite
"""

from glob import glob
import os
import re
from string import Template
Expand All @@ -29,9 +30,6 @@ from setuptools.command.build_py import build_py as _build_py
from distutils.command.build_scripts import build_scripts as _build_scripts
from distutils import log

# Recursive globbing like in Python 3.5
from glob2 import glob

# These variables come from automake.
subst = dict(prefix=os.path.abspath('build/inst'))
subst['exec_prefix'] = Template('@exec_prefix@').substitute(**subst)
Expand Down Expand Up @@ -145,8 +143,6 @@ setup(
'Intended Audience :: Science/Research',
'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
'Operating System :: POSIX',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand All @@ -166,11 +162,12 @@ setup(
exclude_package_data={'lalapps.data': ['earth*.dat.gz', 'sun*.dat.gz',
'tdb*.dat.gz', 'te*.dat.gz']},
packages=find_packages(PYTHONDIR) + ['lalapps.bin', 'lalapps.data'],
scripts=glob(BINDIR + '/*') + glob(LIBEXECDIR + '/**/*.py'),
scripts=(glob(BINDIR + '/*', recursive=True) +
glob(LIBEXECDIR + '/**/*.py', recursive=True)),
ext_modules=[Extension(os.path.relpath(filename, PYTHONDIR)
.replace('.so', '')
.replace('/', '.'), [])
for filename in glob(PYTHONDIR + '/**/*.so')],
for filename in glob(PYTHONDIR + '/**/*.so', recursive=True)],
extras_require={
'lalinference': ['gwpy', 'gwdatafind']
},
Expand Down

0 comments on commit bbb2097

Please sign in to comment.