diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | __init__.py | 4 | ||||
| -rw-r--r-- | setup.py | 30 | ||||
| -rwxr-xr-x | tox.ini | 5 |
6 files changed, 22 insertions, 22 deletions
@@ -9,3 +9,4 @@ syntax: glob _doc TODO +tmp @@ -22,4 +22,4 @@ RUN echo ' auditwheel repair "$whl" -w /src/dist/' >> /usr/bin/makewheel RUN echo 'done' >> /usr/bin/makewheel RUN chmod 755 /usr/bin/makewheel -CMD /usr/bin/makewheel 27 35 36 37 38 +CMD /usr/bin/makewheel 27 35 36 37 38 39 @@ -1,6 +1,6 @@ The MIT License (MIT) - Copyright (c) 2019-2020 Anthon van der Neut, Ruamel bvba + Copyright (c) 2019-2021 Anthon van der Neut, Ruamel bvba Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/__init__.py b/__init__.py index f9ea70c..2829f61 100644 --- a/__init__.py +++ b/__init__.py @@ -7,8 +7,8 @@ if False: # MYPY _package_data = dict( full_package_name='ruamel.yaml.clib', - version_info=(0, 2, 3), - __version__='0.2.3', + version_info=(0, 2, 4), + __version__='0.2.4', author='Anthon van der Neut', author_email='a.van.der.neut@ruamel.eu', description='C version of reader, parser and emitter for ruamel.yaml derived from libyaml', @@ -323,17 +323,17 @@ class NameSpacePackager(object): self.command = None self.python_version() self._pkg = [None, None] # required and pre-installable packages - if ( - sys.argv[0] == 'setup.py' - and sys.argv[1] == 'install' - and '--single-version-externally-managed' not in sys.argv - ): - if os.environ.get('READTHEDOCS', None) == 'True': - os.system('pip install .') - sys.exit(0) - if not os.environ.get('RUAMEL_NO_PIP_INSTALL_CHECK', False): - print('error: you have to install with "pip install ."') - sys.exit(1) + if sys.argv[0] == 'setup.py' and sys.argv[1] == 'install': + debug('calling setup.py', sys.argv) + if '-h' in sys.argv: + pass + elif '--single-version-externally-managed' not in sys.argv: + if os.environ.get('READTHEDOCS', None) == 'True': + os.system('pip install .') + sys.exit(0) + if not os.environ.get('RUAMEL_NO_PIP_INSTALL_CHECK', False): + print('error: you have to install with "pip install ."') + sys.exit(1) # If you only support an extension module on Linux, Windows thinks it # is pure. That way you would get pure python .whl files that take # precedence for downloading on Linux over source with compilable C code @@ -799,8 +799,8 @@ class NameSpacePackager(object): try: tmp_dir = tempfile.mkdtemp(prefix='tmp_ruamel_') bin_file_name = 'test' + self.pn(target['name']) - print('test compiling', bin_file_name) file_name = os.path.join(tmp_dir, bin_file_name + '.c') + print('test compiling', file_name, '->', bin_file_name, end=' ') with open(file_name, 'w') as fp: # write source fp.write(c_code) # and try to compile it @@ -824,15 +824,17 @@ class NameSpacePackager(object): except CompileError: debug('compile error:', file_name) print('compile error:', file_name) - continue + raise except LinkError: debug('link error', file_name) print('link error', file_name) - continue + raise + print('OK') self._ext_modules.append(ext) except Exception as e: # NOQA debug('Exception:', e) print('Exception:', e) + sys.exit(1) if sys.version_info[:2] == (3, 4) and platform.system() == 'Windows': traceback.print_exc() finally: @@ -1,6 +1,6 @@ [tox] # toxworkdir = /data1/DATA/tox/ruamel.yaml.clib -envlist = cs,py38,py27,py37,py36,py35,py39,pypy,py27m +envlist = cs,py39,py38,py37,py36,py35 [testenv] skip_install = True @@ -11,9 +11,6 @@ deps = pytest wheel -[testenv:py27m] -basepython = /opt/python/2.7.15m/bin/python - [testenv:cs] basepython = python3.6 deps = |