Skip to content

Commit

Permalink
Merge pull request #151 from NREL/master
Browse files Browse the repository at this point in the history
ensuring compatability
  • Loading branch information
AadilLatif authored Sep 30, 2024
2 parents bf8d834 + 7bfad79 commit 0783198
Show file tree
Hide file tree
Showing 548 changed files with 26,122 additions and 28,022 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pull_request_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest]
#os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.7", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand All @@ -20,7 +20,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install '.[dev]'
python -m pip install -e '.[dev]'
- name: Run pytests
run: |
python -m pytest -v --disable-warnings
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7'
python-version: '3.11'
- name: Install pypa/build
run: >-
python -m pip install build --user
Expand Down
165 changes: 163 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Export/*
ProjectFiles/*/PyDSS Settings/*
ProjectFiles/*/pydss Settings/*
__pycache__/*
*/__pycache__/*
__pycache__
Expand All @@ -15,4 +15,165 @@ store.h5
simulation-run.toml
*.log
*.bak
docs/source/PyDSS/*
docs/source/pydss/*
dist/


# Created by https://www.toptal.com/developers/gitignore/api/python
# Edit at https://www.toptal.com/developers/gitignore?templates=python

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
*.svg
# C extensions
*.so
*$hdf5

# Distribution / packaging
.Python
project/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
pytestdebug.log

# Translations
*.mo
*.pot

*.tar.gz
*.whl

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/
doc/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
#poetry.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
# .env
.env/
.venv/
env/
venv/
ENV/
env.bak/
venv.bak/
pythonenv*

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# operating system-related files
# file properties cache/storage on macOS
*.DS_Store
# thumbnail cache on Windows
Thumbs.db

# profiling data
.prof


# End of https://www.toptal.com/developers/gitignore/api/python
3,812 changes: 0 additions & 3,812 deletions .ipynb_checkpoints/Untitled-checkpoint.ipynb

This file was deleted.

49 changes: 0 additions & 49 deletions DESCRIPTION.rst

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ FROM python:3.7.0-slim
RUN apt-get update

# Copy the source code
COPY . /PyDSS
COPY . /pydss

# Change directory to the src folder
WORKDIR /PyDSS
WORKDIR /pydss

RUN pip install --upgrade setuptools
RUN pip install --upgrade pip
Expand Down
76 changes: 0 additions & 76 deletions PyDSS/NetworkModifier.py

This file was deleted.

1 change: 0 additions & 1 deletion PyDSS/ProfileManager/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion PyDSS/ProfileManager/hooks/__init__.py

This file was deleted.

5 changes: 0 additions & 5 deletions PyDSS/__init__.py

This file was deleted.

Loading

0 comments on commit 0783198

Please sign in to comment.