Skip to content

Commit

Permalink
Fix conflicts in developer docs, converting to markdown where needed
Browse files Browse the repository at this point in the history
  • Loading branch information
callumforrester committed Jan 23, 2024
1 parent 9858749 commit 3336027
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 423 deletions.
3 changes: 1 addition & 2 deletions .github/CONTRIBUTING.rst → .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Contributing to the project
===========================
# Contributing to the project

TODO

Expand Down
17 changes: 0 additions & 17 deletions docs/explanations/decisions.rst

This file was deleted.

26 changes: 0 additions & 26 deletions docs/explanations/decisions/0001-record-architecture-decisions.rst

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Accepted

## Context

We should use the following [python_copier_template](https://github.com/DiamondLightSource/python_copier_template).
We should use the following [python_copier_template](https://github.com/DiamondLightSource/python-copier-template).
The template will ensure consistency in developer
environments and package management.

Expand Down
24 changes: 8 additions & 16 deletions docs/explanations/structure.rst → docs/explanations/structure.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,41 @@
Skeleton Project Structure
==========================
# Skeleton Project Structure

The skeleton project has the following folders at the root level.

src
---
## src

This folder contains the source code for the project. Typically this
contains a single folder with the package name for the project and the
folder contains python modules files.

See `src` for details.

tests
-----
## tests

This folder holds all of the tests that will be run by pytest, both locally
and in CI.

See `using pytest`

docs
----
## docs

This folder contains the source for sphinx documentation.

See `documentation structure` for details.

.github
-------
## .github

Configuration for the Continuous Integration Workflow on
github

VSCode specific folders
-----------------------
## VSCode specific folders

.devcontainer
~~~~~~~~~~~~~
### .devcontainer

Configuration for running the developer container for this project
in VSCode.

.vscode
~~~~~~~
### .vscode

VSCode settings for this project.

Expand Down
38 changes: 0 additions & 38 deletions docs/how-to/build-docs.rst

This file was deleted.

3 changes: 2 additions & 1 deletion docs/how-to/contribute.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.. include:: ../../../.github/CONTRIBUTING.md
```{include} ../../.github/CONTRIBUTING.md
```
1 change: 0 additions & 1 deletion docs/how-to/contribute.rst

This file was deleted.

53 changes: 0 additions & 53 deletions docs/how-to/dev-install.rst

This file was deleted.

18 changes: 0 additions & 18 deletions docs/how-to/excalidraw.rst

This file was deleted.

41 changes: 0 additions & 41 deletions docs/how-to/lint.rst

This file was deleted.

19 changes: 0 additions & 19 deletions docs/how-to/make-release.rst

This file was deleted.

18 changes: 0 additions & 18 deletions docs/how-to/run-tests.rst

This file was deleted.

8 changes: 0 additions & 8 deletions docs/how-to/static-analysis.rst

This file was deleted.

Loading

0 comments on commit 3336027

Please sign in to comment.