Skip to content

Commit

Permalink
Merge pull request #144 from NREL/documentation_fix
Browse files Browse the repository at this point in the history
bug fix on documentation
  • Loading branch information
AadilLatif authored Mar 25, 2024
2 parents 9f92231 + 3d7f420 commit af59324
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 24 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/pull_request_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest]
#os: [ubuntu-latest, macos-latest]
#os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9"] #["3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 2 additions & 0 deletions docs/source/CLI interface.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLI Interface
^^^^^^^^^^^^^

.. click:: pydss.cli.pydss:cli
:prog: Command line interface
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_autosummary/PyDSS.api.server.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pydss.api.server
pydss.api.server
================

.. automodule:: pydss.api.server
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_autosummary/PyDSS.api.src.web.handler.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pydss.api.src.web.handler
pydss.api.src.web.handler
=========================

.. automodule:: pydss.api.src.web.handler
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_autosummary/PyDSS.cli.pydss.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pydss.cli.pydss
pydss.cli.pydss
===============

.. automodule:: pydss.cli.pydss
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_autosummary/PyDSS.cli.run_server.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pydss.cli.run\_server
pydss.cli.run\_server
=====================

.. automodule:: pydss.cli.run_server
Expand Down
1 change: 0 additions & 1 deletion docs/source/_autosummary/PyDSS.pydss_fs_interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ pydss.pydss\_fs\_interface

PyDssArchiveFileInterfaceBase
PyDssFileSystemInterface
PyDssFileSystemInterface
PyDssTarFileInterface
PyDssZipFileInterface

Expand Down
3 changes: 2 additions & 1 deletion docs/source/_autosummary/PyDSS.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Pydss

Pydss
=====

.. automodule:: pydss
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ def find_version(*file_paths):
return version_match.group(1)
raise RuntimeError("Unable to find version string.")

project = 'PyDSS'
project = 'Pydss'
copyright = '2019, Aadil Latif'
author = 'Aadil Latif'

# The full version, including alpha/beta/rc tags
release = find_version("../../PyDSS", "__init__.py")
release = find_version("../../src/pydss", "__init__.py")

# -- General configuration ---------------------------------------------------

Expand Down Expand Up @@ -91,7 +91,7 @@ def find_version(*file_paths):

redoc = [
{
'name': 'PyDSS API',
'name': 'Pydss API',
'page': 'api',
'spec': 'spec/swagger.yml',
'embed': True,
Expand Down
17 changes: 4 additions & 13 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
.. figure:: _static/Logo.png
:align: center

#####
Pydss
#####

***********
About PyDSS
About Pydss
***********

PyDSS is a Python wrapper for OpenDSS that aims to expand upon its
Pydss is a Python wrapper for OpenDSS that aims to expand upon its
organizational, analytical, and visualization capabilities with these features:

- Allows the user to develop custom control algorithms for specific circuit elements and run them
Expand All @@ -25,7 +22,7 @@ organizational, analytical, and visualization capabilities with these features:
- Automates collection and analysis of circuit element results at each simulation time step.
- Flexible architecture allows users to develop extensions.

PyDSS uses opendssdirect.py (https://pypi.org/project/OpenDSSDirect.py/) to communicate with
Pydss uses opendssdirect.py (https://pypi.org/project/OpenDSSDirect.py/) to communicate with
OpenDSS.

.. _installation_label:
Expand All @@ -43,18 +40,12 @@ Here is an example conda command:
$ conda create -n pydss python=3.9
Install shapely with conda. pip, particularly on Windows, often fails to install its dependent
libraries.

.. code-block:: bash
$ conda install shapely
Install the latest supported pydss version with this command:

.. code-block:: bash
$ pip install dsspy
$ pip install NREL-pydss
Alternatively, to get the lastest code from the master branch:

Expand Down

0 comments on commit af59324

Please sign in to comment.