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.

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

fix: add cloudpickle dependency for dask[dataframe] #146

Merged
merged 1 commit into from
Nov 12, 2020

Conversation

thebaptiste
Copy link
Contributor

Close: #144

@mergify mergify bot merged commit 52a51a0 into integration Nov 12, 2020
@mergify mergify bot deleted the dask_dataframe branch November 12, 2020 15:38
mergify bot pushed a commit that referenced this pull request Nov 12, 2020
Close: #144
(cherry picked from commit 52a51a0)

# Conflicts:
#	.metwork-framework/components.md
#	layers/layer4_python2_scientific/0499_extra_packages/requirements-to-freeze.txt
#	layers/layer4_python3_scientific/0499_extra_packages/requirements-to-freeze.txt
mergify bot added a commit that referenced this pull request Nov 12, 2020
This is an automated backport of pull request #146 done by Mergify

Cherry-pick of 52a51a0 has failed:
```
On branch mergify/bp/release_1.0/pr-146
Your branch is up to date with 'origin/release_1.0'.

You are currently cherry-picking commit 52a51a0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   integration_tests/0003_test_import_python2_scientific/import_python2_scientific.py
	modified:   integration_tests/0003_test_import_python3_scientific/import_python3_scientific.py
	modified:   layers/layer4_python2_scientific/0499_extra_packages/requirements2.txt
	modified:   layers/layer4_python3_scientific/0499_extra_packages/requirements3.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   .metwork-framework/components.md
	both modified:   layers/layer4_python2_scientific/0499_extra_packages/requirements-to-freeze.txt
	both modified:   layers/layer4_python3_scientific/0499_extra_packages/requirements-to-freeze.txt

```

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/
</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants