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

Change to toc ch3 #40

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Conversation

amandakube
Copy link
Collaborator

Removed data8 material, changed section names, added placeholders for people to work off of to, hopefully, reduce merge conflicts as we all write the chapter together

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@jesteria
Copy link
Member

jesteria commented Dec 6, 2022

To reiterate, there has never been material in this repository belonging to Data-8. (I'm guessing that's not news. I just want to be clear. Here is where this was last discussed in full.)

Rather, these materials were put together from a BSD-licensed demo.

It sounds like the team has plans for new content to take this place, and perhaps even regardless of the above. Sounds good.

I'll add that at least a couple of these programming chapters I wrote from scratch for the textbook, (in addition to the chapter on DataFrames), way back in 2020. Perhaps these are no longer needed. But they are particularly distinct from the above:

@amandakube
Copy link
Collaborator Author

What I meant about the data8 material is that it is in data8 (not necessarily belonging to). I think the consensus is that we don't want to include any information that is also in their textbook (including the demo material). I am sorry if I also removed content that you wrote, I was told it was all the same and honestly didn't check. Please add any of your material back to this section and we can rewrite the ones that were replicated. We also wanted our section names to be distinct from those used in data8 which is why we changed some of those as well. Maybe we can reformat some of what you had into these new sections? For example, including call-expression (built-in functions) in the same section as functions in general. Or moving some of the sequences material into the data structures chapter and keeping some in a new section for dictionaries. Would this be ok with you? If so, you are welcome to do that so that it is written the way you would like.

@jesteria
Copy link
Member

jesteria commented Dec 7, 2022

Sure, understood.

And, to be sure, what I'd written (way back when) was done with an older conception of the chapter and textbook in mind. I hope it can still be of use, but I'd certainly understand if it weren't or if it had to be adapted.

I'll restore what I'd written. And it sounds like we can just see what there is to do with it.

@jesteria
Copy link
Member

jesteria commented Dec 8, 2022

OK:

  • It looks like your fork is fine; nonetheless, this branch contained a stale commit that was preventing a merge. (It is generally best to delete branches once they've been merged, and perhaps that was at issue.) Anyway, I just dropped that duplicative/stale changeset and it's good now.
  • I added the old-but-non-demo Sequences page back in. Perhaps this will be of use, perhaps not! (I ultimately elected to let the Functions one drop – there wasn't much in there, and it looks like the group intends to do a more thorough job on the topic.)
  • It also looks like there are typos in the TOC. Sorry for all the updates but I can just tweak those now….

add placeholders for new content

(retain non-demo originating content: Sequences)

Co-authored-by: Jesse London <[email protected]>
@jesteria jesteria merged commit 0deca82 into uchicago-dsi:master Dec 8, 2022
@amandakube amandakube deleted the placeholders branch December 13, 2022 17:52
campbelle1 pushed a commit to campbelle1/EC_textbook-datascience-1 that referenced this pull request Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content textbook content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants