diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6fa11790e57521135dccf08f00b22725d1bd43c..14894b01b0d9e4ca8976d03c5a3a3c7af23209e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,3 +21,16 @@ Python 3.6: - gfortran except: - tags + +Python 2.7 Apple: + script: + - py_version=2.7 + - EXTRA_INSTALL="numpy mako" + - export PYFMMLIB_BUILD_MODE=setuptools + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - ". ./build-and-test-py-project.sh" + tags: + - apple + - python2.7 + except: + - tags diff --git a/setup.py b/setup.py index a6cc75d7dba7a8a31e0fb68b897150f69ded0ab0..65da29f495824ee96af120a0c9fadfc60438d71f 100644 --- a/setup.py +++ b/setup.py @@ -68,8 +68,9 @@ def main(): # NOTE: gfortran 8.1+ errors on incorrect dummy argument shape # https://groups.google.com/forum/#!topic/comp.lang.fortran/x3JnAjRX-KA os.environ["FOPT"] = "-std=legacy {}".format(FOPT_ARGS) - os.environ["OPT"] = "-std=legacy {}".format(OPT_ARGS) - os.environ["EXTRA_LINK_ARGS"] = "-shared {}".format(EXTRA_LINK_ARGS) + + os.environ["OPT"] = OPT_ARGS + os.environ["EXTRA_LINK_ARGS"] = EXTRA_LINK_ARGS try: import mako # noqa