From aa9bd4934492b6ad8be3aa619dc1211851b8721b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 3 Dec 2016 10:38:30 +0100 Subject: [PATCH 1/3] ARROW-379: Use setuptools_scm for Python versioning Change-Id: I5e2c8e332b689fd75b6d1880f9b152f08b0655eb --- dev/release/00-prepare.sh | 5 ----- python/.git_archival.txt | 1 + python/.gitattributes | 1 + python/pyarrow/__init__.py | 8 ++++++++ python/setup.cfg | 3 +++ python/setup.py | 23 ++--------------------- 6 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 python/.git_archival.txt create mode 100644 python/.gitattributes create mode 100644 python/setup.cfg diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 3423a3e6c5b..00af5e77681 100644 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -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" diff --git a/python/.git_archival.txt b/python/.git_archival.txt new file mode 100644 index 00000000000..95cb3eea4e3 --- /dev/null +++ b/python/.git_archival.txt @@ -0,0 +1 @@ +ref-names: $Format:%D$ diff --git a/python/.gitattributes b/python/.gitattributes new file mode 100644 index 00000000000..00a7b00c94e --- /dev/null +++ b/python/.gitattributes @@ -0,0 +1 @@ +.git_archival.txt export-subst diff --git a/python/pyarrow/__init__.py b/python/pyarrow/__init__.py index d4d0f00c523..779b1a83b1c 100644 --- a/python/pyarrow/__init__.py +++ b/python/pyarrow/__init__.py @@ -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, diff --git a/python/setup.cfg b/python/setup.cfg new file mode 100644 index 00000000000..a913e07b329 --- /dev/null +++ b/python/setup.cfg @@ -0,0 +1,3 @@ +[build_sphinx] +source-dir = doc/ +build-dir = doc/_build diff --git a/python/setup.py b/python/setup.py index 341cc64aa2c..0f6bbda6ec3 100644 --- a/python/setup.py +++ b/python/setup.py @@ -42,27 +42,9 @@ 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): @@ -261,15 +243,12 @@ def get_outputs(self): 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 @@ -279,6 +258,8 @@ def get_outputs(self): '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', From 15fe9b280c4015a8a625e8822e2eba4894b2dcd6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 3 Dec 2016 13:18:37 +0100 Subject: [PATCH 2/3] Add license header Change-Id: I60ffd3d3bc56d47d84f43ace1b781857000000e5 --- python/setup.cfg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/python/setup.cfg b/python/setup.cfg index a913e07b329..caae3e081b6 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,3 +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 From 3a68d9f4432cb8f8fb2593c48be932c8274e4ec0 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 4 Dec 2016 11:51:24 +0100 Subject: [PATCH 3/3] Remove deprecated version import Change-Id: Ife0f24a584e829e2b5fb3a1a50343c06d90bf362 --- python/pyarrow/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/pyarrow/__init__.py b/python/pyarrow/__init__.py index 779b1a83b1c..f366317d04c 100644 --- a/python/pyarrow/__init__.py +++ b/python/pyarrow/__init__.py @@ -51,5 +51,3 @@ from pyarrow.table import (Column, RecordBatch, dataframe_from_batches, Table, from_pandas_dataframe) - -from pyarrow.version import version as __version__