Skip to content

Commit a9b0485

Browse files
authored
Merge pull request #512 from grahamgower/release-prep
Prepare for release
2 parents 2aafb15 + 02d4b56 commit a9b0485

9 files changed

Lines changed: 54 additions & 27 deletions

File tree

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Build Docs
3838
run: |
3939
cd docs
40-
make dist
40+
make
4141
4242
- name: Checkout docs site
4343
if: (!github.event.pull_request)

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 0.2.3 - 2023-05-04
4+
5+
- Fixed the use of numpy strings for deme names.
6+
({user}`terhorst`, {user}`grahamgower`, {issue}`495`, {pr}`505`)
7+
- Added `Graph.rename_demes()` method to return a graph with renamed demes.
8+
({user}`aabiddanda`, {pr}`499`)
9+
310
## 0.2.2 - 2022-04-28
411

512
Better conformance to the spec. Minor discrepancies between

docs/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,5 @@ DEMES_VERSION:=$(shell PYTHONPATH=${PYTHONPATH} \
77
dev:
88
./build.sh
99

10-
dist:
11-
@echo Building distribution for demes version ${DEMES_VERSION}
12-
sed -i s/__DEMES_VERSION__/${DEMES_VERSION}/g _config.yml
13-
./build.sh
14-
1510
clean:
1611
rm -fR _build

docs/_config.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
title: Demes manual
55
author: PopSim Consortium
6-
copyright: "2021"
6+
copyright: "2021-2023"
77
only_build_toc_files: true
8-
# logo: logo.png
98

109
execute:
1110
execute_notebooks: cache
@@ -15,19 +14,6 @@ repository:
1514
branch: main
1615
path_to_book: docs
1716

18-
launch_buttons:
19-
# Disable binder launch button on pages with python code.
20-
binderhub_url: ""
21-
22-
html:
23-
use_issues_button: true
24-
use_repository_button: true
25-
use_edit_page_button: true
26-
# Do not edit this - the version placeholder is replaced by the
27-
# current version during a distribution build in the Makefile
28-
extra_navbar: demes __DEMES_VERSION__
29-
extra_footer: demes __DEMES_VERSION__
30-
3117
sphinx:
3218
extra_extensions:
3319
- sphinx.ext.autodoc
@@ -49,3 +35,18 @@ sphinx:
4935

5036
# Don't use fully-qualified type names. E.g. demes.demes.Graph
5137
autodoc_typehints: none
38+
39+
html_show_sphinx: false
40+
# https://piccolo-theme.readthedocs.io/
41+
html_theme: "piccolo_theme"
42+
# some custom css to fix piccolo/notebook in dark modes
43+
html_static_path: ["_static"]
44+
html_css_files: ["custom.css"]
45+
46+
html_theme_options:
47+
globaltoc_collapse: false
48+
globaltoc_maxdepth: -1
49+
globaltoc_includehidden: true
50+
51+
## piccolo_theme options
52+
source_url: https://github.com/popsim-consortium/demes-python

docs/_static/custom.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Fixes for images with transparent backgrounds and notebook output
3+
* when using dark mode with piccolo_theme.
4+
*/
5+
.cell_output img {
6+
background-color: white !important;
7+
}
8+
section img {
9+
background-color: white !important;
10+
}
11+
div.cell summary {
12+
background-color: #eeffcc !important;
13+
color: #252630 !important;
14+
}
15+
div.cell_output,
16+
div.cell_input
17+
{
18+
background: inherit !important;
19+
}
20+
21+
.cell_output .output.text_plain,
22+
.cell_output .output.traceback,
23+
.cell_output .output.stream,
24+
.cell_output .output.stderr {
25+
background: inherit !important;
26+
}

docs/_toc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
format: jb-article
2-
root: introduction
2+
root: index
33
sections:
4+
- file: introduction
45
- file: installation
56
- file: quickstart
67
- file: api

docs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<meta http-equiv="refresh" content="0; URL=introduction.html" />

requirements/docs.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
demesdraw==0.3.1
22
jupyter-book==0.15.1
3+
piccolo_theme==0.15.0
34
sphinx_issues==3.0.1
45
sphinxcontrib-programoutput==0.17

setup.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ classifiers =
1212
Operating System :: OS Independent
1313
Intended Audience :: Science/Research
1414
Programming Language :: Python :: 3
15-
Programming Language :: Python :: 3.7
16-
Programming Language :: Python :: 3.8
17-
Programming Language :: Python :: 3.9
18-
Programming Language :: Python :: 3.10
19-
Programming Language :: Python :: 3.11
2015
Topic :: Scientific/Engineering
2116
Topic :: Scientific/Engineering :: Bio-Informatics
2217
project_urls =

0 commit comments

Comments
 (0)