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

Update to WBT Open Core v2.3.0 #54

Merged
merged 3 commits into from
Mar 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/py-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- master
workflow_dispatch:
schedule:
- cron: '0 6 * * 1'
- cron: "0 6 * * 1"

name: py-check
jobs:
Expand All @@ -18,12 +18,12 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
include:
- os: macos-latest
python-version: "3.10"
- os: windows-latest
python-version: "3.10"
- os: macos-latest
python-version: "3.10"
- os: windows-latest
python-version: "3.10"

env:
SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ whitebox/WBT/
**/*.tar.xz
**/*.xml
whitebox/img/.DS_Store
whitebox/img/._*
whitebox/plugins
whitebox/testdata/breached.tif
whitebox/testdata/flow_accum.tif
Expand Down Expand Up @@ -120,3 +121,4 @@ whitebox/WhiteboxTools_linux_amd64.zip
whitebox/img/._WhiteboxToolsLogo_box_only.png
whitebox/img/.DS_Store
whitebox/GeneralToolsetExtension_linux.zip
whitebox/settings.json
41 changes: 15 additions & 26 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#
import os
import sys

sys.path.insert(0, os.path.abspath('..'))

import whitebox
Expand Down Expand Up @@ -90,20 +91,17 @@

if not on_rtd: # only import and set the theme if we're building docs locally
import sphinx_rtd_theme

html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

html_context = {
'css_files': [
'_static/theme_overrides.css'
]
}
html_context = {'css_files': ['_static/theme_overrides.css']}
else:
html_context = {
'css_files': [
'//media.readthedocs.org/css/sphinx_rtd_theme.css',
'//media.readthedocs.org/css/readthedocs-doc-embed.css',
'_static/theme_overrides.css'
'_static/theme_overrides.css',
]
}

Expand Down Expand Up @@ -131,15 +129,12 @@
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
Expand All @@ -149,21 +144,15 @@
# (source start file, target name, title, author, documentclass
# [howto, manual, or own class]).
latex_documents = [
(master_doc, 'whitebox.tex',
u'whitebox Documentation',
u'Qiusheng Wu', 'manual'),
(master_doc, 'whitebox.tex', u'whitebox Documentation', u'Qiusheng Wu', 'manual'),
]


# -- Options for manual page output ------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'whitebox',
u'whitebox Documentation',
[author], 1)
]
man_pages = [(master_doc, 'whitebox', u'whitebox Documentation', [author], 1)]


# -- Options for Texinfo output ----------------------------------------
Expand All @@ -172,13 +161,13 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'whitebox',
u'whitebox Documentation',
author,
'whitebox',
'One line description of project.',
'Miscellaneous'),
(
master_doc,
'whitebox',
u'whitebox Documentation',
author,
'whitebox',
'One line description of project.',
'Miscellaneous',
),
]



Loading