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

sync fork for major update #117

Merged
merged 172 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from 171 commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
0458d59
delete datasets
chennesy Oct 3, 2023
b709b3e
add data and setup
chennesy Oct 3, 2023
c4ae13a
add jupyter to index
chennesy Oct 5, 2023
e63d430
delete break episodes
chennesy Oct 5, 2023
c7b8476
reorder episodes
chennesy Oct 5, 2023
201adcf
add workflows
chennesy Oct 5, 2023
98f2b45
start episode 1 edits
chennesy Oct 5, 2023
e0bb8da
add detailed jupyter intro
chennesy Oct 6, 2023
165510c
add jupyter details to episode 1
chennesy Oct 9, 2023
ce9c28c
fix unmatched tag
chennesy Oct 9, 2023
64c1ce4
add why python section
chennesy Oct 17, 2023
8723c9b
episode 1 cleanup
chennesy Oct 17, 2023
3724563
rewrite episode 2
chennesy Oct 20, 2023
6d88e8a
rewrite episode 3
chennesy Oct 20, 2023
4527296
update episode 4
chennesy Oct 23, 2023
c9e83f0
reorder early episodes
chennesy Oct 23, 2023
958dd42
fix config.yaml
chennesy Nov 2, 2023
da35bc9
update functions
chennesy Nov 2, 2023
43dc130
rename data zip file
chennesy Nov 6, 2023
1dd27de
update episodes 06 and 07
chennesy Nov 6, 2023
177062a
update episode 08
chennesy Nov 7, 2023
599d131
update conditionals episode
chennesy Nov 29, 2023
c0d71d9
update episodes09 to 11
chennesy Nov 30, 2023
ec51684
Update README.md
chennesy Nov 30, 2023
104722a
remove types episode
chennesy Nov 30, 2023
a9d4daf
add pandas episode
chennesy Nov 30, 2023
8cb9d64
fix config to list pandas episode
chennesy Nov 30, 2023
db45fac
Update 06-for-loops.md
quist00 Dec 8, 2023
e5c1d35
adopt `for` loop for consistency and correct 2nd instance
quist00 Dec 11, 2023
a2f6c64
Merge pull request #6 from quist00/patch-1
chennesy Dec 11, 2023
4ec8c9a
add bundle of updates addressing Palmquist feedback
chennesy Dec 19, 2023
65b2d20
Fix ModuleNotFoundError header 05-libraries.md
chennesy Jan 17, 2024
69efe3b
Update 03-lists.md - clarify first item in list
chennesy Jan 17, 2024
3a9a372
Update 02-variables.md - fix typos
chennesy Jan 17, 2024
b7fef7c
Merge pull request #11 from chennesy/chennesy-patch-3
scottcpeterson Jan 17, 2024
5a4af1e
Merge pull request #10 from chennesy/chennesy-patch-2
scottcpeterson Jan 17, 2024
e58316e
Merge pull request #9 from chennesy/chennesy-patch-1
scottcpeterson Jan 17, 2024
ae874cb
add challenges to 07-looping-data-sets.md
chennesy Jan 24, 2024
409c126
shorten and rename episode 2
chennesy Jan 30, 2024
db1b697
Refactor variable names and use more lists in exercises for 03-lists.md
quist00 Jan 30, 2024
b8dbc84
Refactor function calls in 04-functions.md to point out nesting per o…
quist00 Feb 3, 2024
f7a5c84
Modify naming to be more library-centric
quist00 Feb 3, 2024
1846f9d
Update help documentation
quist00 Feb 3, 2024
67c1ff1
Merge pull request #26 from quist00/updateEpisode4
chennesy Feb 5, 2024
edf47db
Merge pull request #25 from quist00/updateEpisode3
chennesy Feb 5, 2024
afb3849
Update date to August 26, 1971 plus library trivia
quist00 Feb 5, 2024
e23d379
Merge pull request #27 from quist00/updateEpisode5
chennesy Feb 5, 2024
c65377a
Update index.md
scottcpeterson Feb 9, 2024
c0b9a9c
Merge pull request #28 from chennesy/scottcpeterson-patch-1
chennesy Feb 9, 2024
5a806d3
Update 07-looping-data-sets.md
scottcpeterson Feb 9, 2024
3553634
Merge pull request #12 from chennesy/chennesy-patch-1
scottcpeterson Feb 9, 2024
42efe50
add loc and iloc to pandas episode
chennesy Feb 14, 2024
0728fc4
Merge pull request #30 from chennesy/episode_8
scottcpeterson Feb 26, 2024
c1f7047
Merge pull request #24 from chennesy/episode_2
jt14den Feb 27, 2024
a99f6f3
rename episodes fixes #23
chennesy Mar 5, 2024
da69c1e
Merge pull request #35 from chennesy/rename_episodes
chennesy Mar 5, 2024
3084f8f
add f-strings
chennesy Mar 5, 2024
2599bf2
shorten lists episode
chennesy Mar 5, 2024
d9c7214
cut content from lists and
chennesy Mar 5, 2024
e122188
Merge pull request #36 from chennesy/variables_update
jt14den Mar 8, 2024
626376e
Merge pull request #37 from chennesy/lists_update
jt14den Mar 8, 2024
be91217
add new challenges to loops
chennesy Mar 14, 2024
2207635
removing output of list before indexError
jt14den Mar 17, 2024
e4f3354
move scope to writing functions
chennesy Mar 18, 2024
a946b5b
add config update to fix PR #41
chennesy Mar 18, 2024
0289f57
fixing empty parameters error in writing functions
jt14den Mar 19, 2024
3ac1e47
Refactor if and else statements to use f-strings
quist00 Mar 19, 2024
bffe2b1
Merge pull request #45 from chennesy/funct_param_miss
chennesy Mar 19, 2024
e5e0319
Merge pull request #46 from quist00/fstringsForConditionals
chennesy Mar 19, 2024
02304b9
remove functions with conditionals section
chennesy Mar 19, 2024
599b53a
50 to 85 records
chennesy Mar 19, 2024
11f8098
Merge pull request #49 from chennesy/issue_47
quist00 Mar 20, 2024
23754ab
update to fstrings in 2 episodes
chennesy Mar 20, 2024
21cc6fd
remove style episode
chennesy Mar 20, 2024
bd22853
add challenges to pandas episode
chennesy Mar 19, 2024
ebb9dd7
Update setup.md
scottcpeterson Apr 8, 2024
fb38684
Update getting-started.md--remove in
scottcpeterson Apr 8, 2024
2f2dede
Update getting-started.md--add <kbd>return</kbd>
scottcpeterson Apr 8, 2024
302b05f
Update getting-started.md--remove dash from start of sentence
scottcpeterson Apr 8, 2024
48ec9b1
Merge pull request #54 from chennesy/scottcpeterson-patch-2
chennesy Apr 9, 2024
a5c7cf5
Merge pull request #56 from chennesy/scottcpeterson-patch-4
chennesy Apr 9, 2024
7775d0f
Merge pull request #55 from chennesy/scottcpeterson-patch-3
chennesy Apr 9, 2024
c861f64
Update variables.md--Add Format output with f-strings
scottcpeterson Apr 9, 2024
9990254
Update variables.md--an text about f strings
scottcpeterson Apr 9, 2024
41b2f44
Merge pull request #58 from chennesy/scottcpeterson-patch-4
chennesy Apr 10, 2024
5bcdc81
Merge pull request #57 from chennesy/scottcpeterson-patch-3
chennesy Apr 10, 2024
0729e2a
Update setup.md--clean up data download instructions
scottcpeterson Apr 10, 2024
3dfa06c
Update getting-started.md--fixing grammar and spelling mistakes
scottcpeterson Apr 10, 2024
203d1d9
Update variables.md--added faded f string challenge
scottcpeterson Apr 10, 2024
411f451
Merge pull request #59 from chennesy/scottcpeterson-patch-3
chennesy Apr 11, 2024
7a94141
Merge pull request #60 from chennesy/scottcpeterson-patch-4
chennesy Apr 11, 2024
b8fe5f5
Update variables.md
chennesy Apr 11, 2024
3b9ddfc
Merge pull request #61 from chennesy/scottcpeterson-patch-5
chennesy Apr 11, 2024
528f454
Update lists.md--add note about empty list [] to challenge
scottcpeterson Apr 12, 2024
0d436da
Update functions.md--updated text about function (0-9, A-Z, a-z) comp…
scottcpeterson Apr 13, 2024
429e4fb
Update lists.md--removed key points empty list
scottcpeterson Apr 13, 2024
e75e29f
Update looping-data-sets.md--added key points for episode
scottcpeterson Apr 14, 2024
243f7a2
Update variables.md-capiltize Types
scottcpeterson Apr 14, 2024
13741ab
Update pandas.md--fixed pandas and pickel capitilizaton problems
scottcpeterson Apr 14, 2024
b08d6f0
Update libraries.md--changed Pandas to pandas where appropriate.
scottcpeterson Apr 14, 2024
6b21593
Merge pull request #62 from chennesy/scottcpeterson-patch-3
chennesy Apr 15, 2024
3270710
Merge pull request #68 from chennesy/scottcpeterson-patch-9
chennesy Apr 15, 2024
707518f
Merge pull request #67 from chennesy/scottcpeterson-patch-8
chennesy Apr 15, 2024
578a348
Merge pull request #66 from chennesy/scottcpeterson-patch-7
chennesy Apr 15, 2024
188f7b5
Merge pull request #65 from chennesy/scottcpeterson-patch-6
chennesy Apr 15, 2024
ae2412b
Merge pull request #64 from chennesy/scottcpeterson-patch-5
chennesy Apr 15, 2024
5d1d2d8
Merge pull request #63 from chennesy/scottcpeterson-patch-4
chennesy Apr 15, 2024
f8bd48a
Update libraries.md--change give to gives
scottcpeterson Apr 16, 2024
7ce3259
Merge pull request #73 from chennesy/scottcpeterson-patch-3
chennesy Apr 17, 2024
729de64
adding long data
jt14den Apr 17, 2024
45642c9
Merge branch 'main' of https://github.com/chennesy/lc-python-intro
jt14den Apr 17, 2024
434b928
Update libraries.md--change thing_name to function
scottcpeterson Apr 17, 2024
6255eea
Update libraries.md--standardize libraries vs packages and modules
scottcpeterson Apr 17, 2024
31375d8
adding tsv long version
jt14den Apr 17, 2024
71a07e0
Update libraries.md--cleaning up confusion between libraries and modules
scottcpeterson Apr 17, 2024
577e45c
Update libraries.md--standardizing libraries or packages
scottcpeterson Apr 17, 2024
1d135e2
Update for-loops.md--move nit from code to output
scottcpeterson Apr 18, 2024
4f53f91
Merge pull request #77 from chennesy/scottcpeterson-patch-7
chennesy Apr 18, 2024
e0245c6
Merge pull request #76 from chennesy/scottcpeterson-patch-6
chennesy Apr 18, 2024
03c0546
Merge pull request #75 from chennesy/scottcpeterson-patch-5
chennesy Apr 18, 2024
97310c8
Delete episodes/data/circ_long.csv
jt14den Apr 18, 2024
3e75190
Merge pull request #78 from chennesy/scottcpeterson-patch-8
chennesy Apr 18, 2024
59720a6
Merge branch 'main' into scottcpeterson-patch-3
chennesy Apr 18, 2024
0942f39
Merge pull request #74 from chennesy/scottcpeterson-patch-3
chennesy Apr 18, 2024
ea7b45a
removing malformed tsv
jt14den Apr 18, 2024
01f571c
adding long tsv
jt14den Apr 18, 2024
61563e3
Update libraries.md
chennesy Apr 18, 2024
d4a35d6
adding de-dupped data
jt14den Apr 20, 2024
0a091aa
tidy-data-episode
jt14den Apr 23, 2024
248e209
Update tidy.md
chennesy Apr 25, 2024
546b10a
add config and image
chennesy Apr 25, 2024
8439d04
merge tidy.md
chennesy Apr 25, 2024
9b59b7e
edit lists episode
chennesy Apr 26, 2024
9135897
make cuts to conditionals
chennesy Apr 26, 2024
6d83486
add for loops image and exercises
chennesy Apr 26, 2024
60cc42b
edit getting started episode
chennesy Apr 26, 2024
2cad876
change loop image
chennesy May 1, 2024
4eab639
Merge pull request #85 from chennesy/add_loop_image
scottcpeterson May 1, 2024
83043d4
Merge pull request #86 from chennesy/getting_started_edit
scottcpeterson May 1, 2024
6699f9c
Update conditionals.md
chennesy May 8, 2024
adabfaf
Merge pull request #84 from chennesy/shorten_conditionals
chennesy May 8, 2024
a889120
Update tidy.md
chennesy May 8, 2024
e25308e
Merge pull request #81 from chennesy/tidy-data-episode
chennesy May 8, 2024
7352f3d
Update writing-functions.md
jt14den Apr 16, 2024
920a829
Update writing-functions.md
chennesy May 9, 2024
7578f69
data visualization episode 1st draft
jt14den May 13, 2024
f5ceed9
add plotly output
chennesy May 14, 2024
01da32f
Merge pull request #88 from chennesy/datavis
chennesy May 14, 2024
dfe9315
Merge pull request #83 from chennesy/lists_fix
scottcpeterson May 15, 2024
94f8f2f
update dataset
chennesy May 16, 2024
f2e9c1b
update zip of CSV files
chennesy May 17, 2024
c16a924
Merge pull request #92 from chennesy/fix_data_zip
chennesy May 17, 2024
f180a24
Update data-visualisation.md
chennesy May 17, 2024
7b7f587
Update README.md
chennesy May 17, 2024
3b4540d
Update config.yaml
chennesy May 24, 2024
3d74b8b
updating zip file to contain pkl
jt14den May 25, 2024
4df4b97
removing matplot explicity use
jt14den May 26, 2024
594190d
Merge pull request #93 from chennesy/zip-data
chennesy May 26, 2024
6244234
Merge pull request #94 from chennesy/removing-matplotlib
chennesy May 26, 2024
9ea74e8
Update tidy.md
jt14den May 30, 2024
1ec8a37
removing date from data-visualisation.md
jt14den May 30, 2024
f6080c7
update data files
chennesy Jun 3, 2024
d209bec
Merge pull request #96 from chennesy/jt14den-patch-1
chennesy Jun 3, 2024
9629030
update md table of df_long
chennesy Jun 3, 2024
a9f5926
Merge pull request #97 from chennesy/jt14den-patch-2
chennesy Jun 3, 2024
c6cf332
moving to beta
chennesy Jun 5, 2024
d65809f
Update README.md
chennesy Jun 14, 2024
06640a5
add tidy exercises
chennesy Jun 12, 2024
265867b
fix tidy closing tag
chennesy Jun 13, 2024
71e8a2d
add exercises to dataviz
chennesy Jun 12, 2024
e2b9cb4
Merge branch 'main' into resolved
chennesy Jun 14, 2024
1ab956f
change create date back to 2018
chennesy Jun 17, 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
Empty file modified .github/workflows/README.md
100755 → 100644
Empty file.
Empty file modified .github/workflows/pr-close-signal.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/pr-comment.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/pr-post-remove-branch.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/pr-preflight.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/pr-receive.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/sandpaper-main.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/update-cache.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/update-workflows.yaml
100755 → 100644
Empty file.
64 changes: 23 additions & 41 deletions README.md
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)


38 changes: 18 additions & 20 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Member

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...

Copy link
Contributor Author

@chennesy chennesy Jun 17, 2024

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.


# 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'
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The 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:
Expand All @@ -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
133 changes: 0 additions & 133 deletions episodes/01-getting-started.md

This file was deleted.

Loading
Loading