Skip to content

Commit 60b4a95

Browse files
author
The TensorFlow Datasets Authors
committed
Move mlcroissant installation to setup.py as we use pip now.
PiperOrigin-RevId: 679581334
1 parent 07a92bc commit 60b4a95

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.github/actions/setup/action.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ runs:
3434
sudo apt-spy2 fix --commit --launchpad --country=US
3535
sudo apt-get update
3636
shell: bash
37-
# Install protobuf-compiler for gcld3 library.
37+
# Install protobuf-compiler for gcld3 library and graphviz for mlcroissant.
3838
- if: ${{ runner.os == 'Linux' }}
3939
run: |
4040
sudo apt install -y --allow-downgrades libprotobuf-lite23=3.12.4-1ubuntu7 libprotobuf23=3.12.4-1ubuntu7 libprotoc23=3.12.4-1ubuntu7
4141
sudo apt install -y libprotobuf-dev=3.12.4-1ubuntu7 protobuf-compiler=3.12.4-1ubuntu7
42+
sudo apt install -y libgraphviz-dev
4243
shell: bash
4344
- if: ${{ runner.os == 'macOS' }}
4445
# protobuf version must be compatible with C++11 (used by gcld3)
@@ -48,6 +49,7 @@ runs:
4849
echo "LDFLAGS=-L/usr/local/opt/protobuf@21/lib" >> $GITHUB_ENV
4950
echo "CPPFLAGS=-I/usr/local/opt/protobuf@21/include" >> $GITHUB_ENV
5051
echo "PKG_CONFIG_PATH=/usr/local/opt/protobuf@21/lib/pkgconfig" >> $GITHUB_ENV
52+
brew install graphviz
5153
shell: bash
5254
- uses: FedericoCarboni/setup-ffmpeg@v2 # for Audio FeatureConnector tests.
5355

@@ -79,12 +81,3 @@ runs:
7981
# Get TFDS library from the repository instead of cache.
8082
- run: echo "PYTHONPATH=$(pwd)" >> $GITHUB_ENV
8183
shell: bash
82-
# Get mlcroissant from PyPI to fix the version.
83-
- if: ${{ runner.os == 'Linux' }}
84-
run: sudo apt-get install -y libgraphviz-dev
85-
shell: bash
86-
- if: ${{ runner.os == 'macOS' }}
87-
run: brew install graphviz
88-
shell: bash
89-
- run: pip install "mlcroissant>=1.0.9"
90-
shell: bash

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
'pytest-shard',
9393
'pytest-xdist',
9494
# Lazy-deps required by core
95-
'pandas',
96-
'pydub',
9795
'apache-beam',
9896
'conllu',
99-
# TODO(b/142892342): Re-enable
97+
'mlcroissant>=1.0.9',
98+
'pandas',
99+
'pydub',
100100
# 'tensorflow-docs @ git+https://github.com/tensorflow/docs#egg=tensorflow-docs', # pylint: disable=line-too-long
101101
# Required by scripts/documentation/
102102
'pyyaml',

0 commit comments

Comments
 (0)