Skip to content

ARROW-6513: [CI] Rename conda requirements files to have txt extension instead of yml #10656

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
kszucs wants to merge 1 commit into from
Closed

ARROW-6513: [CI] Rename conda requirements files to have txt extension instead of yml #10656

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
2 changes: 1 addition & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,7 +1842,7 @@ if(ARROW_BUILD_BENCHMARKS)
# archive. So the benchmark package on conda-forge isn't report
# the real version. We accept all the benchmark package with
# conda. Conda users should install benchmark 1.5.2 or later by
# ci/conda_env_cpp.yml.
# ci/conda_env_cpp.txt.
set(BENCHMARK_REQUIRED_VERSION 0.0.0)
endif()
resolve_dependency(benchmark
Expand Down
4 changes: 2 additions & 2 deletions dev/release/verify-release-candidate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ set PYTHON=3.6
@rem Using call with conda.bat seems necessary to avoid terminating the batch
@rem script execution
call conda create --no-shortcuts -c conda-forge -f -q -y -p %_VERIFICATION_CONDA_ENV% ^
--file=ci\conda_env_cpp.yml ^
--file=ci\conda_env_python.yml ^
--file=ci\conda_env_cpp.txt ^
--file=ci\conda_env_python.txt ^
git ^
python=%PYTHON% ^
|| exit /B 1
Expand Down
10 changes: 5 additions & 5 deletions docs/source/developers/cpp/windows.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Arrow codebase):

.. code-block:: shell

conda create -y -n arrow-dev --file=ci\conda_env_cpp.yml
conda create -y -n arrow-dev --file=ci\conda_env_cpp.txt

Then "activate" this conda environment with:

Expand Down Expand Up @@ -138,7 +138,7 @@ of Arrow and run the command:
--clean-after-build

On Windows, vcpkg builds dynamic link libraries by default. Use the triplet
``x64-windows-static`` to build static libraries. vcpkg downloads source
``x64-windows-static`` to build static libraries. vcpkg downloads source
packages and compiles them locally, so installing dependencies with vcpkg is
more time-consuming than with conda.

Expand All @@ -150,12 +150,12 @@ Then in your ``cmake`` command, to use dependencies installed by vcpkg, set:

You can optionally set other variables to override the default CMake
configurations for vcpkg, including:

* ``-DCMAKE_TOOLCHAIN_FILE``: by default, the CMake scripts automatically find
the location of the vcpkg CMake toolchain file ``vcpkg.cmake``; use this to
instead specify its location
* ``-DVCPKG_TARGET_TRIPLET``: by default, the CMake scripts attempt to infer the
vcpkg
vcpkg
`triplet <https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md>`_;
use this to instead specify the triplet
* ``-DARROW_DEPENDENCY_USE_SHARED``: default is ``ON``; set to ``OFF`` for
Expand Down Expand Up @@ -408,7 +408,7 @@ tests can be made with there individual make targets).

.. code-block:: shell

conda install -c conda-forge --file .\ci\conda_env_cpp.yml
conda install -c conda-forge --file .\ci\conda_env_cpp.txt
.\ci\appveyor-cpp-setup.bat
@rem this might fail but at this point most unit tests should be buildable by there individual targets
@rem see next line for example.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/developers/documentation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ If you're using Conda, the required software can be installed in a single line:

.. code-block:: shell

conda install -c conda-forge --file=ci/conda_env_sphinx.yml
conda install -c conda-forge --file=ci/conda_env_sphinx.txt

Otherwise, you'll first need to install `Doxygen <http://www.doxygen.nl/>`_
yourself (for example from your distribution's official repositories, if
Expand Down
14 changes: 7 additions & 7 deletions docs/source/developers/python.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ On Linux and macOS:
.. code-block:: shell

conda create -y -n pyarrow-dev -c conda-forge \
--file arrow/ci/conda_env_unix.yml \
--file arrow/ci/conda_env_cpp.yml \
--file arrow/ci/conda_env_python.yml \
--file arrow/ci/conda_env_gandiva.yml \
--file arrow/ci/conda_env_unix.txt \
--file arrow/ci/conda_env_cpp.txt \
--file arrow/ci/conda_env_python.txt \
--file arrow/ci/conda_env_gandiva.txt \
compilers \
python=3.7 \
pandas
Expand Down Expand Up @@ -431,9 +431,9 @@ First, starting from fresh clones of Apache Arrow:
.. code-block:: shell

conda create -y -n pyarrow-dev -c conda-forge ^
--file arrow\ci\conda_env_cpp.yml ^
--file arrow\ci\conda_env_python.yml ^
--file arrow\ci\conda_env_gandiva.yml ^
--file arrow\ci\conda_env_cpp.txt ^
--file arrow\ci\conda_env_python.txt ^
--file arrow\ci\conda_env_gandiva.txt ^
python=3.7
conda activate pyarrow-dev

Expand Down
6 changes: 3 additions & 3 deletions python/examples/minimal_build/build_conda.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ function setup_miniconda() {
conda config --add channels conda-forge

conda create -y -n pyarrow-$PYTHON -c conda-forge \
--file arrow/ci/conda_env_unix.yml \
--file arrow/ci/conda_env_cpp.yml \
--file arrow/ci/conda_env_python.yml \
--file arrow/ci/conda_env_unix.txt \
--file arrow/ci/conda_env_cpp.txt \
--file arrow/ci/conda_env_python.txt \
compilers \
python=3.7 \
pandas
Expand Down