Skip to content

Commit

Permalink
Merge branch 'ProjectPythia:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jukent authored Mar 29, 2024
2 parents 2375467 + bea4f45 commit 7a592c0
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 11 deletions.
20 changes: 16 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Pythia Foundations
author: the <a href="https://projectpythia.org/">Project Pythia</a> Community
logo: images/logos/pythia_logo-white-rtext.svg
email: [email protected]
copyright: '2022'
copyright: '2024'

exclude_patterns:
- README.md
Expand Down Expand Up @@ -98,13 +98,15 @@ sphinx:
html_theme: sphinx_pythia_theme
html_permalinks_icon: '<i class="fas fa-link"></i>'
html_theme_options:
google_analytics_id: 'G-G57FLM9M46'
analytics:
google_analytics_id: 'G-G57FLM9M46'
home_page_in_toc: true
repository_url: https://github.com/ProjectPythia/pythia-foundations # Online location of your book
repository_branch: main # Which branch of the repository should be used when creating links (optional)
use_issues_button: true
use_repository_button: true
use_edit_page_button: true
use_fullscreen_button: true
github_url: https://github.com/ProjectPythia
twitter_url: https://twitter.com/project_pythia
icon_links:
Expand All @@ -118,7 +120,10 @@ sphinx:
extra_navbar: |
We want your feedback! Fill out this <a href="https://docs.google.com/forms/d/e/1FAIpQLSeVa1TC9xM-dk7qIE2e8bsgSrIP82yYDNw3wew3J46eREJa4w/viewform?usp=sf_link">Google Form</a>
or see our <a href="https://foundations.projectpythia.org/appendix/how-to-contribute.html">Contributor's Guide</a>.
logo_link: https://projectpythia.org
logo:
link: https://projectpythia.org
navbar_start:
- navbar-logo
navbar_links:
- name: Home
url: https://projectpythia.org
Expand All @@ -132,7 +137,14 @@ sphinx:
url: https://projectpythia.org/index.html#join-us
- name: Blog
url: https://projectpythia.org/blog.html
navbar_end:
- navbar-icon-links
footer_logos:
NCAR: images/logos/NCAR-contemp-logo-blue.svg
NCAR: images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg
Unidata: images/logos/Unidata_logo_horizontal_1200x300.svg
UAlbany: images/logos/UAlbany-A2-logo-purple-gold.svg
footer_start:
- footer-logos
- footer-menu
- footer-info
- footer-extra
7 changes: 7 additions & 0 deletions _static/custom.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
.bd-main .bd-content .bd-article-container {
max-width: 100%; /* default is 60em */
}
.bd-page-width {
max-width: 100%; /* default is 88rem */
}

kbd {
/* Based on: https://dylanatsmith.com/wrote/styling-the-kbd-element */

Expand Down
2 changes: 1 addition & 1 deletion core/datetime/datetime.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
"1. the date/time string you wish to parse\n",
"2. the format which describes exactly how the date and time are arranged. \n",
"\n",
"[The full range of formatting options for strftime() and strptime() is described in the Python documentation](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior). In most cases, finding the correct formatting options inherently takes some degree of experimentation to get right. This is a situation where Python shines; you can use the IPython interpreter, or a Jupyter notebook, to quickly test numerous formatting options. Beyond the official documentation, Google and [Stack Overflow](https://stackoverflow.com/) are your friends in this process. \n",
"[The full range of formatting options for strftime() and strptime() is described in the Python documentation](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior). In most cases, finding the correct formatting options inherently takes some degree of experimentation to get right. This is a situation where Python shines; you can use the IPython interpreter, or a Jupyter notebook, to quickly test numerous formatting options. Beyond the official documentation, Google and Stack Overflow are your friends in this process. \n",
"\n",
"After some trial and error (as described above), you can find that, in this example, the format string `'%m/%d/%y %H:%M:%S.%f'` will convert the date and time in the data to the correct format."
]
Expand Down
4 changes: 2 additions & 2 deletions core/xarray/dask-arrays-xarray.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,8 @@
" \n",
" * [Xarray Docs](https://xarray.pydata.org/)\n",
" \n",
"* If you require assistance with a specific issue involving Xarray or Dask, the following links may be of use:\n",
" * [`dask`](http://stackoverflow.com/questions/tagged/dask) tag on Stack Overflow, for usage questions\n",
"* If you require assistance with a specific issue involving Xarray or Dask, the following resources may be of use:\n",
" * Dask tag on StackOverflow, for usage questions\n",
" * [github discussions: dask](https://github.com/dask/dask/discussions) for general, non-bug, discussion, and usage questions\n",
" * [github issues: dask](https://github.com/dask/dask/issues/new) for bug reports and feature requests\n",
" * [github discussions: xarray](https://github.com/pydata/xarray/discussions) for general, non-bug, discussion, and usage questions\n",
Expand Down
4 changes: 1 addition & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- nc-time-axis
- netcdf4
- numpy
- pip
- pre-commit
- dask
- pyproj
Expand All @@ -21,5 +20,4 @@ dependencies:
- python-graphviz
- graphviz
- setuptools>=69.0.3
- pip:
- sphinx-pythia-theme
- sphinx-pythia-theme
1 change: 0 additions & 1 deletion images/logos/NCAR-contemp-logo-blue.svg

This file was deleted.

1 change: 1 addition & 0 deletions images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7a592c0

Please sign in to comment.