Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion ci/conda_env_python.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ numpy>=1.16.6
pytest
pytest-faulthandler
s3fs>=2023.10.0
setuptools>=64
setuptools>=77
setuptools_scm>=8
1 change: 1 addition & 0 deletions python/LICENSE.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does symbolic link work on Windows...?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I guess there's no other way to fix it then other than copying or creating new licence and notice files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have copied over the files for the tests @rok

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per https://gitforwindows.org/symbolic-links.html:

Short version: there is no exact equivalent for POSIX symlinks on Windows, and the closest thing is unavailable for non-admins by default unless Developer Mode is enabled and a relatively recent Windows 10 version is used. Therefore, symlink emulation support is only turned on by default when that scenario is detected. Support can be enabled by the user, via the core.symlinks=true config setting.

Windows 10 reached EOL last month, and supposedly Developer Mode is required for Visual Studio use.

I'm not sure of all the Windows workflows that may / may not require developer mode, but maybe its worth just requiring it for any Windows devs of PyArrow so that symlinks can be used?

1 change: 1 addition & 0 deletions python/NOTICE.txt
9 changes: 6 additions & 3 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ requires = [
# configuring setuptools_scm in pyproject.toml requires
# versions released after 2022
"setuptools_scm[toml]>=8",
"setuptools>=64",
"setuptools>=77",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required due to setuptools<77 not recognizing the new license strings proposed in this PR (see pypa/setuptools#4903 for explanation). I'm not sure if this is controversial so bringing it up here. @raulcd

]
build-backend = "setuptools.build_meta"

Expand All @@ -37,9 +37,12 @@ dynamic = ["version"]
requires-python = ">=3.9"
description = "Python library for Apache Arrow"
readme = {file = "README.md", content-type = "text/markdown"}
license = {text = "Apache Software License"}
license = "Apache-2.0"
license-files = [
"LICENSE.txt",
"NOTICE.txt",
]
classifiers = [
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
Expand Down
2 changes: 1 addition & 1 deletion python/requirements-build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ cython>=3
oldest-supported-numpy>=0.14; python_version<'3.9'
numpy>=1.25; python_version>='3.9'
setuptools_scm>=8
setuptools>=64
setuptools>=77
5 changes: 0 additions & 5 deletions python/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
# specific language governing permissions and limitations
# under the License.

[metadata]
license_files =
../LICENSE.txt
../NOTICE.txt

[build_sphinx]
source-dir = doc/
build-dir = doc/_build
Expand Down
Loading