Revert "ARROW-429: Revert ARROW-379 until git-archive issues are resolved"

This reverts commit 68e39c6868.
This commit is contained in:
Uwe L. Korn committed 2016-12-20 15:27:06 +01:00
1 parent d7845fcd8b
commit 14b8136646
6 files changed
+32 -28

No files matched your search

-5
View File
@@ -43,9 +43,4 @@ mvn release:prepare -Dtag=${tag} -DreleaseVersion=${version} -DautoVersionSubmod
cd -
cd "${SOURCE_DIR}/../../python"
sed -i "s/VERSION = '[^']*'/VERSION = '${version}'/g" setup.py
sed -i "s/ISRELEASED = False/ISRELEASED = True/g" setup.py
cd -
echo "Finish staging binary artifacts by running: sh dev/release/01-perform.sh"
+1
View File
@@ -0,0 +1 @@
ref-names: $Format:%D$
+1
View File
@@ -0,0 +1 @@
.git_archival.txt export-subst
+8 -2
View File
@@ -17,6 +17,14 @@
# flake8: noqa
from pkg_resources import get_distribution, DistributionNotFound
try:
__version__ = get_distribution(__name__).version
except DistributionNotFound:
# package is not installed
pass
import pyarrow.config
from pyarrow.array import (Array,
@@ -43,5 +51,3 @@ from pyarrow.schema import (null, bool_,
DataType, Field, Schema, schema)
from pyarrow.table import Column, RecordBatch, Table, from_pandas_dataframe
from pyarrow.version import version as __version__
+20
View File
@@ -0,0 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
[build_sphinx]
source-dir = doc/
build-dir = doc/_build
+2 -21
View File
@@ -42,27 +42,9 @@ is_64_bit = sys.maxsize > 2**32
if Cython.__version__ < '0.19.1':
raise Exception('Please upgrade to Cython 0.19.1 or newer')
VERSION = '0.1.0'
ISRELEASED = False
if not ISRELEASED:
VERSION += '.dev'
setup_dir = os.path.abspath(os.path.dirname(__file__))
def write_version_py(filename=os.path.join(setup_dir, 'pyarrow/version.py')):
a = open(filename, 'w')
file_content = "\n".join(["",
"# THIS FILE IS GENERATED FROM SETUP.PY",
"version = '%(version)s'",
"isrelease = '%(isrelease)s'"])
a.write(file_content % {'version': VERSION,
'isrelease': str(ISRELEASED)})
a.close()
class clean(_clean):
def run(self):
@@ -272,15 +254,12 @@ class build_ext(_build_ext):
return [self._get_cmake_ext_path(name)
for name in self.get_names()]
write_version_py()
DESC = """\
Python library for Apache Arrow"""
setup(
name="pyarrow",
packages=['pyarrow', 'pyarrow.tests'],
version=VERSION,
zip_safe=False,
package_data={'pyarrow': ['*.pxd', '*.pyx']},
# Dummy extension to trigger build_ext
@@ -290,6 +269,8 @@ setup(
'clean': clean,
'build_ext': build_ext
},
use_scm_version = {"root": "..", "relative_to": __file__},
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
install_requires=['cython >= 0.23', 'numpy >= 1.9', 'six >= 1.0.0'],
description=DESC,
license='Apache License, Version 2.0',