Skip to content

Commit 4f4457c

Browse files
authored
Merge pull request #78 from dss-extensions/class_iterators
Class iterators and whole package update
2 parents a8d15eb + 76046c5 commit 4f4457c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+15580
-10817
lines changed

.appveyor.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
You can use the following block of code to find the version of OpenDSSDirect.py that you are using
1313
1414
```python
15-
import opendssdirect as dss
15+
from opendssdirect import dss
1616
print(dss.__version__)
1717
```
1818

.github/workflows/tests.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
python-version: ["3.8", "3.9", "3.10", "3.11"]
12+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1313
os: [ubuntu-latest, windows-latest, macos-latest]
14+
1415
runs-on: ${{ matrix.os }}
1516
steps:
1617
- uses: actions/checkout@v3
@@ -24,7 +25,8 @@ jobs:
2425
run: |
2526
python -m pip install --upgrade pip
2627
python -m pip install pandas matplotlib pytest
27-
python -m pip install -e .[extras]
28+
git fetch --unshallow
29+
python -m pip install .[extras]
2830
2931
- name: Test
3032
run: |
@@ -34,3 +36,8 @@ jobs:
3436
if: runner.os == 'Linux'
3537
run: |
3638
DSS_EXTENSIONS_DEBUG=1 pytest -vv
39+
40+
- name: Test (activate NumPy on Linux only)
41+
if: runner.os == 'Linux'
42+
run: |
43+
OPENDSSDIRECT_PY_USE_NUMPY=1 pytest -vv

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v1.2.3
3+
rev: v4.5.0
44
hooks:
55
- id: trailing-whitespace
66
- id: check-ast
77
- id: check-merge-conflict
8-
- repo: https://github.com/ambv/black
9-
rev: stable
8+
- repo: https://github.com/psf/black
9+
rev: 23.12.1
1010
hooks:
1111
- id: black
12-
args: [--line-length=88, --safe]
13-
python_version: python3.6
12+
args: [--line-length=88, --safe, -S]
13+
python_version: python3.7
1414

.travis.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

README.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,24 @@
55
[![PyPI](https://img.shields.io/pypi/v/OpenDSSDirect.py.svg)](https://pypi.python.org/pypi/OpenDSSDirect.py/)
66
[![Documentation](https://img.shields.io/badge/docs-ready-blue.svg)](http://dss-extensions.org/OpenDSSDirect.py)
77

8-
OpenDSSDirect.py is a cross-platform Python package implements a "direct" library interface [our customized implementation](https://github.com/dss-extensions/dss_capi) of [OpenDSS](http://smartgrid.epri.com/SimulationTool.aspx) using [DSS-Python](https://github.com/dss-extensions/dss_python/).
8+
OpenDSSDirect.py is a cross-platform Python package implements a "direct" library interface to [our customized implementation](https://github.com/dss-extensions/dss_capi) of [OpenDSS](http://smartgrid.epri.com/SimulationTool.aspx) using [DSS-Python](https://github.com/dss-extensions/dss_python/).
99
OpenDSS is an open-source distribution system simulator. See [OpenDSSDirect.jl](https://github.com/dss-extensions/OpenDSSDirect.jl) for a similar package in Julia, and for more context about this project and its components (including alternatives in MATLAB, C++ and C#/.NET), please check [https://dss-extensions.org/](https://dss-extensions.org/) and our hub repository at [dss-extensions/dss-extensions](https://github.com/dss-extensions/dss-extensions) for more documentation, discussions and the [FAQ](https://github.com/dss-extensions/dss-extensions#faq).
1010

11+
12+
<p align="center">
13+
<img alt="Overview of related projects" src="https://github.com/dss-extensions/dss-extensions/blob/main/images/repomap.png?raw=true">
14+
</p>
15+
16+
1117
*As a reminder, although very compatible, this project is not supported by EPRI.*
1218

1319
**This package is available for Windows, Mac and Linux, including ARM and x86 variants.**
1420

15-
### Documentation
21+
## Documentation
1622

1723
The documentation for this package can be found [here](http://dss-extensions.org/OpenDSSDirect.py).
1824

19-
### Installation
25+
## Installation
2026

2127
**Recommended**: Install Python using Miniconda or Anaconda
2228

@@ -26,17 +32,18 @@ Open a command line interface and type the following.
2632
pip install 'OpenDSSDirect.py[extras]'
2733
```
2834

29-
See [installation](https://dss-extensions.org/OpenDSSDirect.py/notebooks/Installation.html) instructions for more information.
35+
See the [installation](https://dss-extensions.org/OpenDSSDirect.py/notebooks/Installation.html) instructions for more information.
36+
37+
Updating from pre-v0.9 versions? [See the upgrade guide for recommendations.](https://dss-extensions.org/OpenDSSDirect.py/updating_to_0.9.html)
3038

31-
### Troubleshooting
39+
## Troubleshooting
3240

3341
It is recommended to use `conda` to install pandas, which is currently a dependency of this package.
3442
This package interfaces with OpenDSS using the "direct" library interface, so a good understanding of OpenDSS will help troubleshooting.
35-
There are plenty of useful resources located [here](https://sourceforge.net/p/electricdss/code/HEAD/tree/trunk/Doc/).
3643

3744
If you are having issues using this Python interface, feel free to open an Issue on GitHub [here](https://github.com/dss-extensions/OpenDSSDirect.py/issues/new).
3845

39-
### Thanks
46+
## Thanks
4047

4148
Thanks to @tshort, Davis, @temcdrm, @GordStephen, @Muxelmann and @PMeira for their contributions, as well as all the users for their valuable feedback.
4249

docs/_static/dssx.png

90.5 KB
Loading

0 commit comments

Comments
 (0)