Skip to content

Commit

Permalink
chore: rename source folder to doc (#30)
Browse files Browse the repository at this point in the history
This is to mimic the folder structure of related projects

Additional changes:
* ci: set conda-forge channel second
  Otherwise, Conda will install Python 3.9
  • Loading branch information
redeboer authored Oct 29, 2020
1 parent 4bb4dfb commit cd1b691
Show file tree
Hide file tree
Showing 38 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

sphinx:
configuration: src/conf.py
configuration: doc/conf.py
fail_on_warning: false

formats:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": false,
"restructuredtext.builtDocumentationPath": "${workspaceFolder}/build/html",
"restructuredtext.confPath": "${workspaceFolder}/src/conf.py",
"restructuredtext.confPath": "${workspaceFolder}/doc/conf.py",
"rewrap.wrappingColumn": 79,
"telemetry.enableCrashReporter": false,
"telemetry.enableTelemetry": false
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# from the environment for the first two.
SPHINXOPTS ?= -T -W --keep-going
SPHINXBUILD ?= sphinx-build
SOURCEDIR = src
SOURCEDIR = doc
BUILDDIR = build

# Put it first so that "make" without argument is like "make help".
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/conf.py → doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
html_theme_options = {
"repository_url": "https://github.com/ComPWA/PWA-pages",
"repository_branch": "master",
"path_to_docs": "src",
"path_to_docs": "doc",
"use_edit_page_button": True,
"use_issues_button": True,
"use_repository_button": True,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: pwa-pages
channels:
- conda-forge
- defaults
- conda-forge
dependencies:
- python>=3.6
- pip
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ exclude = '''

[tool.isort]
profile = "black"
src_paths = ["src/pwa_pages"]
src_paths = ["doc/pwa_pages"]
line_length = 79
2 changes: 1 addition & 1 deletion pyrightconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exclude": [".git", ".tox"],
"include": ["setup.py", "src"],
"include": ["setup.py", "doc"],
"reportGeneralTypeIssues": false,
"reportUnboundVariable": false,
"reportUnusedClass": true,
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ install_requires =
numpy==1.19.2
packages = find:
package_dir =
=src
=doc

[options.packages.find]
where = src
where = doc
include =
pwa_pages

Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ commands =
[flake8]
application-import-names = pwa_pages
filename =
./src/*.py
./doc/*.py
exclude =
__pycache__
src/conf.py
doc/conf.py
ignore = # more info: https://www.flake8rules.com/
B305 # progress.Bar.next()
E203 # https://github.com/psf/black#slices
Expand Down

0 comments on commit cd1b691

Please sign in to comment.