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

CI: clean environment.yml, comment that req-dev is generated #30392

Merged
merged 4 commits into from
Dec 25, 2019

Conversation

jbrockmendel
Copy link
Member

There is a little more id like to do in environment.yml to put docbuild things in the same place, but holding off to keep the diff tidier. Also it appears there are some unused things in environment.yml that we can look into removing, separate PR

@@ -33,7 +33,8 @@ dependencies:
- nbconvert>=5.4.1
- nbsphinx
- pandoc
# Dask and its dependencies

# Dask and its dependencies (that dont install with dask)
Copy link
Member Author

Choose a reason for hiding this comment

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

IIUC conda install dask does the right thing without needing to specify everything else, but pip install dask does not. could we unify all this as dask[dataframe]? also i guess put it in the "downstream tests" block?

Copy link
Member

Choose a reason for hiding this comment

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

@TomAugspurger might have ideas

Copy link
Contributor

Choose a reason for hiding this comment

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

dask[dataframe] works for installing from PyPI, but there isn't a dask[dataframe] or dask-dataframe conda package.

@gfyoung gfyoung added the Dependencies Required and optional dependencies label Dec 22, 2019

pip_content = "\n".join(pip_deps)
fname = os.path.split(conda_fname)[1]
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason for the split here?

Copy link
Member Author

Choose a reason for hiding this comment

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

otherwise we get a full path including username

@@ -33,7 +33,8 @@ dependencies:
- nbconvert>=5.4.1
- nbsphinx
- pandoc
# Dask and its dependencies

# Dask and its dependencies (that dont install with dask)
Copy link
Member

Choose a reason for hiding this comment

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

@TomAugspurger might have ideas

@jreback jreback added this to the 1.0 milestone Dec 23, 2019
Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

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

Nice changes, just one small styling idea.

Comment on lines +93 to +97
header = (
f"# This file is auto-generated from {fname}, do not modify.\n"
"# See that file for comments about the need/usage of each depdendency.\n\n"
)
pip_content = header + "\n".join(pip_deps)
Copy link
Member

Choose a reason for hiding this comment

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

Small personal preference, but I think this would be simpler if when defining pip_deps above, instead of pip_content = [] you write:

pip_content = [
    f"# This file is auto-generated from {fname}, do not modify.",
    "# See that file for comments about the need/usage of each depdendency.",
]

If you do that, all this can be deleted here (you'll have to define fname before).

Copy link
Member Author

Choose a reason for hiding this comment

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

ATM the pip_deps list has a specific meaning. id prefer to retain that

Copy link
Member

Choose a reason for hiding this comment

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

Not important, but headers could still be a list, and use "\n".join(headers + pip_deps). I think it'll still be an improvement, avoiding the \n in the strings. Just saying, happy to get this merge as is.

Copy link
Contributor

Choose a reason for hiding this comment

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

I would actually write this as a triple quoted string.

header = f"""
...
..."""

which avoids the embedded newlines

Copy link
Member Author

Choose a reason for hiding this comment

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

triple quoted strings that arent at the module-level mess with code-folding, so i prefer to avoid them

Copy link
Contributor

Choose a reason for hiding this comment

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

k that's what i would have done, but ok as is.

@jreback jreback merged commit 3029d8f into pandas-dev:master Dec 25, 2019
@jbrockmendel jbrockmendel deleted the ci-cln branch December 25, 2019 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Required and optional dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants