Commit 6755d23d authored by Ole Streicher's avatar Ole Streicher

Update upstream source from tag 'upstream/3.0.1'

Update to upstream version '3.0.1'
with Debian dir be679485845db416a42c885a518ae7983ed207ca
parents 5094fd2a 77a316b0
astropy-helpers Changelog
*************************
3.0.1 (2018-02-22)
------------------
- Nothing changed yet.
3.0 (2018-02-09)
----------------
......@@ -14,6 +20,13 @@ astropy-helpers Changelog
with twine and get registered automatically. [#332]
2.0.5 (2018-02-22)
------------------
- Fix segmentation faults that occurred when the astropy-helpers submodule
was first initialized in packages that also contained Cython code. [#375]
2.0.4 (2018-02-09)
------------------
......
Metadata-Version: 1.2
Name: astropy-helpers
Version: 3.0
Version: 3.0.1
Summary: Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation.
Home-page: https://github.com/astropy/astropy-helpers
Author: The Astropy Developers
......
......@@ -135,7 +135,6 @@ import pkg_resources
from setuptools import Distribution
from setuptools.package_index import PackageIndex
from setuptools.sandbox import run_setup
from distutils import log
from distutils.debug import DEBUG
......@@ -475,9 +474,10 @@ class _Bootstrapper(object):
# setup.py exists we can generate it
setup_py = os.path.join(path, 'setup.py')
if os.path.isfile(setup_py):
with _silence():
run_setup(os.path.join(path, 'setup.py'),
['egg_info'])
# We use subprocess instead of run_setup from setuptools to
# avoid segmentation faults - see the following for more details:
# https://github.com/cython/cython/issues/2104
sp.check_output([sys.executable, 'setup.py', 'egg_info'], cwd=path)
for dist in pkg_resources.find_distributions(path, True):
# There should be only one...
......
def _fix_user_options(options):
"""
This is for Python 2.x and 3.x compatibility. distutils expects Command
options to all be byte strings on Python 2 and Unicode strings on Python 3.
"""
def to_str_or_none(x):
if x is None:
return None
return str(x)
return [tuple(to_str_or_none(x) for x in y) for y in options]
# This file contains settings for pytest that are specific to astropy-helpers.
# Since we run many of the tests in sub-processes, we need to collect coverage
# data inside each subprocess and then combine it into a single .coverage file.
# To do this we set up a list which run_setup appends coverage objects to.
# This is not intended to be used by packages other than astropy-helpers.
import os
import glob
try:
from coverage import CoverageData
except ImportError:
HAS_COVERAGE = False
else:
HAS_COVERAGE = True
if HAS_COVERAGE:
SUBPROCESS_COVERAGE = []
def pytest_configure(config):
if HAS_COVERAGE:
SUBPROCESS_COVERAGE.clear()
def pytest_unconfigure(config):
if HAS_COVERAGE:
# We create an empty coverage data object
combined_cdata = CoverageData()
# Add all files from astropy_helpers to make sure we compute the total
# coverage, not just the coverage of the files that have non-zero
# coverage.
lines = {}
for filename in glob.glob(os.path.join('astropy_helpers', '**', '*.py'), recursive=True):
lines[os.path.abspath(filename)] = []
for cdata in SUBPROCESS_COVERAGE:
# For each CoverageData object, we go through all the files and
# change the filename from one which might be a temporary path
# to the local filename. We then only keep files that actually
# exist.
for filename in cdata.measured_files():
try:
pos = filename.rindex('astropy_helpers')
except ValueError:
continue
short_filename = filename[pos:]
if os.path.exists(short_filename):
lines[os.path.abspath(short_filename)].extend(cdata.lines(filename))
combined_cdata.add_lines(lines)
combined_cdata.write_file('.coverage.subprocess')
# Autogenerated by Astropy-affiliated package astropy_helpers's setup.py on 2018-02-09 16:46:16
# Autogenerated by Astropy-affiliated package astropy_helpers's setup.py on 2018-02-23 00:31:24
from __future__ import unicode_literals
import datetime
version = "3.0"
githash = "b7fc50081b55d46da118bbf7c2fce5cad8350b0e"
version = "3.0.1"
githash = "09bbe9583e70ed1804f1051a3aaca1640d08c6f8"
major = 3
minor = 0
bugfix = 0
bugfix = 1
release = True
timestamp = datetime.datetime(2018, 2, 9, 16, 46, 16)
timestamp = datetime.datetime(2018, 2, 23, 0, 31, 24)
debug = False
try:
......
......@@ -8,7 +8,7 @@ from astropy_helpers.setup_helpers import register_commands, get_package_info
from astropy_helpers.version_helpers import generate_version_py
NAME = 'astropy_helpers'
VERSION = '3.0'
VERSION = '3.0.1'
RELEASE = 'dev' not in VERSION
generate_version_py(NAME, VERSION, RELEASE, False, uses_git=not RELEASE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment