Skip to content

Commit 8764ba6

Browse files
authored
Merge branch 'main' into run-tests
2 parents c36e7f7 + 518d937 commit 8764ba6

File tree

5 files changed

+35
-10
lines changed

5 files changed

+35
-10
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ To do so, follow these steps:
3333
2. Build the documentation:
3434

3535
```
36-
nox -s docs_build
36+
nox -s docs
3737
```
3838

3939
This should create a local environment in a `.nox` folder, build the documentation (as specified in the `noxfile.py` configuration), and the output will be in `_build/html`.
4040

4141
To build live documentation that updates when you update local files, run the following command:
4242

4343
```
44-
nox -s docs_live
44+
nox -s docs-live
4545
```
30.6 KB
Loading

_static/pyos.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ html[data-theme="dark"] {
2626

2727
/* anything related to the light theme */
2828
html[data-theme="light"] {
29-
--pst-color-tbl-row: #E1DEE9!important;
29+
--pst-color-tbl-row: #f5f1ff!important;
3030
}
3131
}
3232

@@ -341,7 +341,7 @@ aside.footnote {
341341

342342

343343
.fa-circle-check {
344-
color: #49b7b9;
344+
color: #7BCDBA;
345345
}
346346

347347
/* pyOpenSci table styles */
@@ -381,4 +381,3 @@ td, th {
381381
border: 1px solid #ccc; /* Light gray border */
382382
padding: 8px; /* Add some padding for better readability */
383383
}
384-

conf.py

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,29 @@
1313
# import os
1414
# import sys
1515
# sys.path.insert(0, os.path.abspath('.'))
16+
from datetime import datetime
17+
import subprocess
18+
19+
current_year = datetime.now().year
20+
organization_name = "pyOpenSci"
21+
1622

1723

1824
# -- Project information -----------------------------------------------------
1925

20-
project = "python-package-guide"
21-
copyright = "2024, pyOpenSci"
26+
project = "pyOpenSci Python Package Guide"
27+
copyright = f"{current_year}, {organization_name}"
2228
author = "pyOpenSci Community"
2329

24-
# The full version, including alpha/beta/rc tags
25-
release = "0.1"
30+
# Get the latest Git tag - there might be a prettier way to do this but...
31+
try:
32+
release_value = subprocess.check_output(["git", "describe", "--tags"]).decode("utf-8").strip()
33+
release_value = release_value[:4]
34+
except subprocess.CalledProcessError:
35+
release_value = "0.1" # Default value in case there's no tag
36+
37+
# Update the release value
38+
release = release_value
2639

2740
# -- General configuration ---------------------------------------------------
2841

tutorials/1-installable-code.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
---
2+
:og:description: Learn how to make your Python code installable so you can use it across projects.
3+
:og:title: Make your Python code installable so it can be used across projects
4+
---
5+
16
# Make your Python code installable
27

38
:::{admonition} What we previously covered
@@ -47,7 +52,11 @@ environment and shell on your computer.
4752
You are welcome to use any Python environment manager that you choose.
4853
If you are using Windows or are not familiar with Shell, you may want to check out the Carpentries shell lesson[^shell-lesson]. Windows users will likely need to configure a tool for any Shell and git related steps.
4954

55+
:::{todo}
56+
When this lesson is published, unlink
5057
* [If you need guidance creating a Python environment, review this lesson](extras/1-create-environment.md) which walks you through creating an environment using both `venv` and `conda`.
58+
:::
59+
5160
* If you aren't sure which environment manager to use and
5261
you are a scientist, we suggest that you use `conda`, particularly if you are working with spatial data.
5362

@@ -287,8 +296,12 @@ For instance, a `build-system` table most often holds two (2) variables:
287296
2. `build-backend = `, which is used to define the specific build-backend name, (in this example we are using `hatchling.build`).
288297

289298
TOML organizes data structures, defining relationships within a configuration
290-
file. You will learn more about the `pyproject.toml` format in the
299+
file.
300+
301+
:::{todo}
302+
You will learn more about the `pyproject.toml` format in the
291303
[next lesson when you add additional metadata / information to this file.](5-pyproject-toml.md)
304+
:::
292305

293306
```toml
294307
# An example of the build-system table which contains two variables - requires and build-backend

0 commit comments

Comments
 (0)