Skip to content
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

Jump to bottom

Revert "[revert] test with Xarray PR branch" #393

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Revert "[revert] test with Xarray PR branch" #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7f86bc
Revert "[revert] test with Xarray PR branch"
dcherian Sep 8, 2024
2bf4606
fix
dcherian Sep 15, 2024
59b4f15
one mroe
dcherian Sep 15, 2024
9f8803c
Merge branch 'main' into revert-test
keewis Oct 12, 2024
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
repository: "dcherian/xarray"
repository: "pydata/xarray"
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a reason why you clone xarray main, then install flox from a github link?

I'd have expected to clone flox, then install xarray from github (or from the nightlies), and then finally install flox from local.

fetch-depth: 0 # Fetch all history for all branches and tags.
- name: Set up conda environment
uses: mamba-org/setup-micromamba@v1
Expand All @@ -116,7 +116,6 @@ jobs:
pint>=0.22
- name: Install xarray
run: |
git checkout flox-preserve-dtype
python -m pip install --no-deps .
- name: Install upstream flox
run: |
Expand Down
3 changes: 1 addition & 2 deletions ci/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ dependencies:
- pytest-pretty
- pytest-xdist
- syrupy
- xarray
- pre-commit
- numpy_groupies>=0.9.19
- pooch
- toolz
- numba
- numbagg>=0.3
- hypothesis
- pip:
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
3 changes: 1 addition & 2 deletions ci/no-dask.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ dependencies:
- toolz
- numba
- numbagg>=0.3
- pip:
- git+https://github.com/dcherian/xarray.git@flox-preserve-dtype
- xarray
Copy link
Contributor

Choose a reason for hiding this comment

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

might need to do the same for env-numpy1?

Loading