Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dev/release/00-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,9 @@ 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 change: 0 additions & 1 deletion python/.git_archival.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion python/.gitattributes
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions python/pyarrow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@

# 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,
Expand All @@ -50,3 +42,5 @@
DataType, Field, Schema, schema)

from pyarrow.table import Column, RecordBatch, Table, from_pandas_dataframe

from pyarrow.version import version as __version__
20 changes: 0 additions & 20 deletions python/setup.cfg
View file
Open in desktop

This file was deleted.

23 changes: 21 additions & 2 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,27 @@
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):
Expand Down Expand Up @@ -254,12 +272,15 @@ 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
Expand All @@ -269,8 +290,6 @@ 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',
Expand Down