-
-
Notifications
You must be signed in to change notification settings - Fork 63
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
sync fork for major update #117
Merged
Merged
Changes from 171 commits
Commits
Show all changes
172 commits
Select commit
Hold shift + click to select a range
0458d59
delete datasets
chennesy b709b3e
add data and setup
chennesy c4ae13a
add jupyter to index
chennesy e63d430
delete break episodes
chennesy c7b8476
reorder episodes
chennesy 201adcf
add workflows
chennesy 98f2b45
start episode 1 edits
chennesy e0bb8da
add detailed jupyter intro
chennesy 165510c
add jupyter details to episode 1
chennesy ce9c28c
fix unmatched tag
chennesy 64c1ce4
add why python section
chennesy 8723c9b
episode 1 cleanup
chennesy 3724563
rewrite episode 2
chennesy 6d88e8a
rewrite episode 3
chennesy 4527296
update episode 4
chennesy c9e83f0
reorder early episodes
chennesy 958dd42
fix config.yaml
chennesy da35bc9
update functions
chennesy 43dc130
rename data zip file
chennesy 1dd27de
update episodes 06 and 07
chennesy 177062a
update episode 08
chennesy 599d131
update conditionals episode
chennesy c0d71d9
update episodes09 to 11
chennesy ec51684
Update README.md
chennesy 104722a
remove types episode
chennesy a9d4daf
add pandas episode
chennesy 8cb9d64
fix config to list pandas episode
chennesy db45fac
Update 06-for-loops.md
quist00 e5c1d35
adopt `for` loop for consistency and correct 2nd instance
quist00 a2f6c64
Merge pull request #6 from quist00/patch-1
chennesy 4ec8c9a
add bundle of updates addressing Palmquist feedback
chennesy 65b2d20
Fix ModuleNotFoundError header 05-libraries.md
chennesy 69efe3b
Update 03-lists.md - clarify first item in list
chennesy 3a9a372
Update 02-variables.md - fix typos
chennesy b7fef7c
Merge pull request #11 from chennesy/chennesy-patch-3
scottcpeterson 5a4af1e
Merge pull request #10 from chennesy/chennesy-patch-2
scottcpeterson e58316e
Merge pull request #9 from chennesy/chennesy-patch-1
scottcpeterson ae874cb
add challenges to 07-looping-data-sets.md
chennesy 409c126
shorten and rename episode 2
chennesy db1b697
Refactor variable names and use more lists in exercises for 03-lists.md
quist00 b8dbc84
Refactor function calls in 04-functions.md to point out nesting per o…
quist00 f7a5c84
Modify naming to be more library-centric
quist00 1846f9d
Update help documentation
quist00 67c1ff1
Merge pull request #26 from quist00/updateEpisode4
chennesy edf47db
Merge pull request #25 from quist00/updateEpisode3
chennesy afb3849
Update date to August 26, 1971 plus library trivia
quist00 e23d379
Merge pull request #27 from quist00/updateEpisode5
chennesy c65377a
Update index.md
scottcpeterson c0b9a9c
Merge pull request #28 from chennesy/scottcpeterson-patch-1
chennesy 5a806d3
Update 07-looping-data-sets.md
scottcpeterson 3553634
Merge pull request #12 from chennesy/chennesy-patch-1
scottcpeterson 42efe50
add loc and iloc to pandas episode
chennesy 0728fc4
Merge pull request #30 from chennesy/episode_8
scottcpeterson c1f7047
Merge pull request #24 from chennesy/episode_2
jt14den a99f6f3
rename episodes fixes #23
chennesy da69c1e
Merge pull request #35 from chennesy/rename_episodes
chennesy 3084f8f
add f-strings
chennesy 2599bf2
shorten lists episode
chennesy d9c7214
cut content from lists and
chennesy e122188
Merge pull request #36 from chennesy/variables_update
jt14den 626376e
Merge pull request #37 from chennesy/lists_update
jt14den be91217
add new challenges to loops
chennesy 2207635
removing output of list before indexError
jt14den e4f3354
move scope to writing functions
chennesy a946b5b
add config update to fix PR #41
chennesy 0289f57
fixing empty parameters error in writing functions
jt14den 3ac1e47
Refactor if and else statements to use f-strings
quist00 bffe2b1
Merge pull request #45 from chennesy/funct_param_miss
chennesy e5e0319
Merge pull request #46 from quist00/fstringsForConditionals
chennesy 02304b9
remove functions with conditionals section
chennesy 599b53a
50 to 85 records
chennesy 11f8098
Merge pull request #49 from chennesy/issue_47
quist00 23754ab
update to fstrings in 2 episodes
chennesy 21cc6fd
remove style episode
chennesy bd22853
add challenges to pandas episode
chennesy ebb9dd7
Update setup.md
scottcpeterson fb38684
Update getting-started.md--remove in
scottcpeterson 2f2dede
Update getting-started.md--add <kbd>return</kbd>
scottcpeterson 302b05f
Update getting-started.md--remove dash from start of sentence
scottcpeterson 48ec9b1
Merge pull request #54 from chennesy/scottcpeterson-patch-2
chennesy a5c7cf5
Merge pull request #56 from chennesy/scottcpeterson-patch-4
chennesy 7775d0f
Merge pull request #55 from chennesy/scottcpeterson-patch-3
chennesy c861f64
Update variables.md--Add Format output with f-strings
scottcpeterson 9990254
Update variables.md--an text about f strings
scottcpeterson 41b2f44
Merge pull request #58 from chennesy/scottcpeterson-patch-4
chennesy 5bcdc81
Merge pull request #57 from chennesy/scottcpeterson-patch-3
chennesy 0729e2a
Update setup.md--clean up data download instructions
scottcpeterson 3dfa06c
Update getting-started.md--fixing grammar and spelling mistakes
scottcpeterson 203d1d9
Update variables.md--added faded f string challenge
scottcpeterson 411f451
Merge pull request #59 from chennesy/scottcpeterson-patch-3
chennesy 7a94141
Merge pull request #60 from chennesy/scottcpeterson-patch-4
chennesy b8fe5f5
Update variables.md
chennesy 3b9ddfc
Merge pull request #61 from chennesy/scottcpeterson-patch-5
chennesy 528f454
Update lists.md--add note about empty list [] to challenge
scottcpeterson 0d436da
Update functions.md--updated text about function (0-9, A-Z, a-z) comp…
scottcpeterson 429e4fb
Update lists.md--removed key points empty list
scottcpeterson e75e29f
Update looping-data-sets.md--added key points for episode
scottcpeterson 243f7a2
Update variables.md-capiltize Types
scottcpeterson 13741ab
Update pandas.md--fixed pandas and pickel capitilizaton problems
scottcpeterson b08d6f0
Update libraries.md--changed Pandas to pandas where appropriate.
scottcpeterson 6b21593
Merge pull request #62 from chennesy/scottcpeterson-patch-3
chennesy 3270710
Merge pull request #68 from chennesy/scottcpeterson-patch-9
chennesy 707518f
Merge pull request #67 from chennesy/scottcpeterson-patch-8
chennesy 578a348
Merge pull request #66 from chennesy/scottcpeterson-patch-7
chennesy 188f7b5
Merge pull request #65 from chennesy/scottcpeterson-patch-6
chennesy ae2412b
Merge pull request #64 from chennesy/scottcpeterson-patch-5
chennesy 5d1d2d8
Merge pull request #63 from chennesy/scottcpeterson-patch-4
chennesy f8bd48a
Update libraries.md--change give to gives
scottcpeterson 7ce3259
Merge pull request #73 from chennesy/scottcpeterson-patch-3
chennesy 729de64
adding long data
jt14den 45642c9
Merge branch 'main' of https://github.com/chennesy/lc-python-intro
jt14den 434b928
Update libraries.md--change thing_name to function
scottcpeterson 6255eea
Update libraries.md--standardize libraries vs packages and modules
scottcpeterson 31375d8
adding tsv long version
jt14den 71a07e0
Update libraries.md--cleaning up confusion between libraries and modules
scottcpeterson 577e45c
Update libraries.md--standardizing libraries or packages
scottcpeterson 1d135e2
Update for-loops.md--move nit from code to output
scottcpeterson 4f53f91
Merge pull request #77 from chennesy/scottcpeterson-patch-7
chennesy e0245c6
Merge pull request #76 from chennesy/scottcpeterson-patch-6
chennesy 03c0546
Merge pull request #75 from chennesy/scottcpeterson-patch-5
chennesy 97310c8
Delete episodes/data/circ_long.csv
jt14den 3e75190
Merge pull request #78 from chennesy/scottcpeterson-patch-8
chennesy 59720a6
Merge branch 'main' into scottcpeterson-patch-3
chennesy 0942f39
Merge pull request #74 from chennesy/scottcpeterson-patch-3
chennesy ea7b45a
removing malformed tsv
jt14den 01f571c
adding long tsv
jt14den 61563e3
Update libraries.md
chennesy d4a35d6
adding de-dupped data
jt14den 0a091aa
tidy-data-episode
jt14den 248e209
Update tidy.md
chennesy 546b10a
add config and image
chennesy 8439d04
merge tidy.md
chennesy 9b59b7e
edit lists episode
chennesy 9135897
make cuts to conditionals
chennesy 6d83486
add for loops image and exercises
chennesy 60cc42b
edit getting started episode
chennesy 2cad876
change loop image
chennesy 4eab639
Merge pull request #85 from chennesy/add_loop_image
scottcpeterson 83043d4
Merge pull request #86 from chennesy/getting_started_edit
scottcpeterson 6699f9c
Update conditionals.md
chennesy adabfaf
Merge pull request #84 from chennesy/shorten_conditionals
chennesy a889120
Update tidy.md
chennesy e25308e
Merge pull request #81 from chennesy/tidy-data-episode
chennesy 7352f3d
Update writing-functions.md
jt14den 920a829
Update writing-functions.md
chennesy 7578f69
data visualization episode 1st draft
jt14den f5ceed9
add plotly output
chennesy 01da32f
Merge pull request #88 from chennesy/datavis
chennesy dfe9315
Merge pull request #83 from chennesy/lists_fix
scottcpeterson 94f8f2f
update dataset
chennesy f2e9c1b
update zip of CSV files
chennesy c16a924
Merge pull request #92 from chennesy/fix_data_zip
chennesy f180a24
Update data-visualisation.md
chennesy 7b7f587
Update README.md
chennesy 3b4540d
Update config.yaml
chennesy 3d74b8b
updating zip file to contain pkl
jt14den 4df4b97
removing matplot explicity use
jt14den 594190d
Merge pull request #93 from chennesy/zip-data
chennesy 6244234
Merge pull request #94 from chennesy/removing-matplotlib
chennesy 9ea74e8
Update tidy.md
jt14den 1ec8a37
removing date from data-visualisation.md
jt14den f6080c7
update data files
chennesy d209bec
Merge pull request #96 from chennesy/jt14den-patch-1
chennesy 9629030
update md table of df_long
chennesy a9f5926
Merge pull request #97 from chennesy/jt14den-patch-2
chennesy c6cf332
moving to beta
chennesy d65809f
Update README.md
chennesy 06640a5
add tidy exercises
chennesy 265867b
fix tidy closing tag
chennesy 71e8a2d
add exercises to dataviz
chennesy e2b9cb4
Merge branch 'main' into resolved
chennesy 1ab956f
change create date back to 2018
chennesy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,62 +1,44 @@ | ||
# Library Carpentry | ||
# Library Carpentry: Python Intro for Libraries | ||
|
||
The Library Carpentry module '[Introduction to programming with Python](https://librarycarpentry.org/lc-python-intro/)' is maintained by [Konrad Foerstner](https://github.com/konrad), [Drew Heles](https://github.com/dheles), [Elizabeth Wickes](https://github.com/elliewix), *[Laura Wrubel](https://github.com/lwrubel)*, [Carlos Martinez](https://github.com/c-martinez) and [Richard Vankoningsveld](https://github.com/richyvk). | ||
## Maintainers for Library Carpentry: Python Intro for Libraries | ||
- [Cody Hennesy](https://github.com/chennesy) (lead) | ||
- [Tim Dennis](https://github.com/jt14den) | ||
|
||
## Status Note | ||
The updated version of this lesson (June 2024) was developed with the assistance of [David Palmquist](https://github.com/quist00) and [Scott Peterson](https://github.com/scottcpeterson). | ||
|
||
The maintainers of this lesson are currently working on a substantial redesign of this lesson. This means than large portions of the current lesson content will be removed or substantially rewritten. You are welcome to submit pull requests for changes that help make this lesson better in the short run, but please keep in mind that the changes you make may be on content slated for removal. | ||
Lesson Maintainers communication is via the [team site](https://github.com/orgs/LibraryCarpentry/teams/lc-python-intro-maintainers). | ||
|
||
## Background | ||
## Past Maintainers for Library Carpentry: Python Intro for Libraries | ||
- [Konrad Foerstner](https://github.com/konrad) | ||
- [Drew Heles](https://github.com/dheles) | ||
- [Elizabeth Wickes](https://github.com/elliewix) | ||
- [Laura Wrubel](https://github.com/lwrubel) | ||
- [Carlos Martinez](https://github.com/c-martinez) | ||
- [Richard Vankoningsveld](https://github.com/richyvk) | ||
|
||
Library Carpentry is a software skills training programme aimed at library and information professions. It builds on the work of [Software Carpentry](https://software-carpentry.org/) and [Data Carpentry](https://www.datacarpentry.org/). | ||
## Library Carpentry | ||
|
||
Library Carpentry is in the commons and for the commons. It is not tied to any institution of person. For more information on Library Carpentry, see our website [librarycarpentry.org](https://librarycarpentry.org/). | ||
[Library Carpentry](https://librarycarpentry.org) is a software and data skills training programme for people working in library- and information-related roles. It builds on the work of [Software Carpentry](https://software-carpentry.org/) and [Data Carpentry](https://www.datacarpentry.org/). Library Carpentry is an official Lesson Program of [The Carpentries](https://carpentries.org/). | ||
|
||
## Contribution | ||
## License | ||
|
||
There are many ways of contributing to Library Carpentry: | ||
All Software, Data, and Library Carpentry instructional material is made available under the [Creative Commons Attribution | ||
license](LICENSE.md). | ||
|
||
- Join our [Gitter discussion forum](https://gitter.im/weaverbel/LibraryCarpentry). | ||
- Follow updates on [Twitter](https://twitter.com/search?f=tweets&vertical=default&q=%23librarycarpentry&src=typd). | ||
- Make a suggestion or correct an error by [raising an Issue](https://github.com/LibraryCarpentry/lc-python-intro/issues). | ||
## Contributing | ||
|
||
### Local Lesson Development | ||
|
||
If you wish to contribute changes or additions to this module, you'll want to | ||
setup a local development environment that allows you to easily test changes | ||
locally. In order to do this, you'll want to do the following: | ||
|
||
1. [Fork this repository](https://help.github.com/articles/fork-a-repo/) | ||
2. Clone your fork of the repository: | ||
|
||
``` | ||
git clone https://github.com/<your-github-username>/lc-python-intro.git | ||
``` | ||
|
||
1. [Install Ruby](https://www.ruby-lang.org/en/downloads/) | ||
2. Install Jekyll `gem install jekyll` | ||
3. Run the Jekyll server locally | ||
|
||
``` | ||
cd <path-to>/lc-python-intro | ||
make serve | ||
``` | ||
|
||
1. Browse to your local server: [http://localhost:4000/](https://localhost:4000/) | ||
2. The `Makefile` has other options as well. To see them type `make` | ||
There are many ways to discuss and contribute to Library Carpentry lessons. The easiest way to get started is to [file an issue](https://github.com/LibraryCarpentry/lc-python-intro/issues) to tell us about a spelling mistake, some awkward wording, or a factual error. This is a good way to introduce yourself and to meet some of our community members. See [Contributing](CONTRIBUTING.md) for more information about contributing Pull Requests and connecting with others in the Carpentries. | ||
|
||
## Code of Conduct | ||
|
||
All participants should agree to abide by the [Software Carpentry Code of Conduct](https://software-carpentry.org/conduct/). | ||
All participants should agree to abide by The Carpentries [Code of Conduct](https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html). | ||
|
||
## Authors | ||
|
||
Library Carpentry is authored and maintained by the [community](https://github.com/LibraryCarpentry/lc-python-intro/network/members). | ||
Library Carpentry is authored and maintained through issues, commits, and pull requests from the community. | ||
|
||
## Citation | ||
|
||
Please cite as: | ||
|
||
Library Carpentry. Introduction to programming with Python. 2017. [https://librarycarpentry.org/lc-python-intro/](https://librarycarpentry.org/lc-python-intro/). | ||
(Add citation once Zenodo is updated) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,14 +14,15 @@ carpentry: 'lc' | |
title: 'Python Intro for Libraries' | ||
|
||
# Date the lesson was created (YYYY-MM-DD, this is empty by default) | ||
created: '2018-04-12' | ||
created: '2024-05-24' | ||
|
||
# Comma-separated list of keywords for the lesson | ||
keywords: 'software, data, lesson, The Carpentries' | ||
|
||
# Life cycle stage of the lesson | ||
# possible values: pre-alpha, alpha, beta, stable | ||
life_cycle: 'alpha' | ||
life_cycle: 'beta' | ||
|
||
|
||
# License of the lesson materials (recommended CC-BY 4.0) | ||
license: 'CC-BY 4.0' | ||
|
@@ -59,23 +60,20 @@ contact: '[email protected]' | |
|
||
# Order of episodes in your lesson | ||
episodes: | ||
- 01-getting-started.md | ||
- 02-variables.md | ||
- 03-types-conversion.md | ||
- 04-built-in.md | ||
- 05-coffee.md | ||
- 06-libraries.md | ||
- 10-lunch.md | ||
- 11-lists.md | ||
- 12-for-loops.md | ||
- 13-looping-data-sets.md | ||
- 14-writing-functions.md | ||
- 15-scope.md | ||
- 16-coffee.md | ||
- 17-conditionals.md | ||
- 18-style.md | ||
- 19-wrap.md | ||
- 20-feedback.md | ||
- getting-started.md | ||
- variables.md | ||
- lists.md | ||
- functions.md | ||
- libraries.md | ||
- for-loops.md | ||
- looping-data-sets.md | ||
- pandas.md | ||
- conditionals.md | ||
- writing-functions.md | ||
- tidy.md | ||
- data-visualisation.md | ||
- wrap.md | ||
Comment on lines
-62
to
+75
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is most likely the reason why you could not automatically sync your fork with the LC lesson on GitHub: a large number of the files have changed name, which has a tendency to confuse Git. |
||
|
||
|
||
# Information for Learners | ||
learners: | ||
|
@@ -92,6 +90,6 @@ profiles: | |
# sandpaper and varnish versions) should live | ||
|
||
|
||
url: 'https://librarycarpentry.github.io/lc-python-intro' | ||
url: https://librarycarpentry.github.io/lc-python-intro | ||
analytics: carpentries | ||
lang: en |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it your intention to set a new creation date? Is this version effectively a completely new lesson, rather than a modification of what was here before? In my view, the creation date is best aligned with the beginning of the repository commit history...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @tobyhodges! It is a major revision, but not completely new, so I changed the created date back to 2018.