Skip to content

Commit

Permalink
Merge branch 'apache:main' into bitvector
Browse files Browse the repository at this point in the history
  • Loading branch information
jp0317 authored Jul 19, 2023
2 parents 2c1c228 + c7741fb commit 97c63fa
Show file tree
Hide file tree
Showing 259 changed files with 3,681 additions and 1,575 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
shell: bash
run: |
gem install test-unit
pip install cython setuptools six pytest jira
pip install "cython<3" setuptools six pytest jira
- name: Run Release Test
env:
ARROW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/issue_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:
issues:
types:
- opened
- edited

permissions:
contents: read
Expand Down Expand Up @@ -56,9 +57,9 @@ jobs:
if (component_labels.length == 0) throw new Error('No components found!');
await github.rest.issues.addLabels({
await github.rest.issues.setLabels({
"owner": context.repo.owner,
"repo": context.repo.repo,
"issue_number": context.payload.issue.number,
"labels": component_labels,
});
});
166 changes: 0 additions & 166 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion ci/conda_env_python.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# don't add pandas here, because it is not a mandatory test dependency
boto3 # not a direct dependency of s3fs, but needed for our s3fs fixture
cffi
cython
cython<3
cloudpickle
fsspec
hypothesis
Expand Down
Loading

0 comments on commit 97c63fa

Please sign in to comment.