diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d25d75e --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg + +# 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/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ +docs/api_reference/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# dotenv +.env + +# virtualenv +.venv +venv/ +ENV/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +# vim +.*.swp + +# IDE +.vscode/ +.idea/ + +data/ +output/ +orion-jupyter.tar +*.csv +*.pkl + +.DS_Store diff --git a/Makefile b/Makefile index ec73002..d643ddc 100644 --- a/Makefile +++ b/Makefile @@ -95,15 +95,15 @@ publish: dist ## package and upload a release twine upload dist/* .PHONY: bumpversion-release -bumpversion-release: ## Merge master to stable and bumpversion release +bumpversion-release: ## Merge main to stable and bumpversion release git checkout stable - git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable" + git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable" bumpversion release git push --tags origin stable .PHONY: bumpversion-patch -bumpversion-patch: ## Merge stable to master and bumpversion patch - git checkout master +bumpversion-patch: ## Merge stable to main and bumpversion patch + git checkout main git merge stable bumpversion --no-tag patch git push @@ -123,10 +123,10 @@ bumpversion-candidate: ## Bump the version to the next candidate CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) CHANGELOG_LINES := $(shell git diff HEAD..origin/stable HISTORY.md 2>&1 | wc -l) -.PHONY: check-master -check-master: ## Check if we are in master branch -ifneq ($(CURRENT_BRANCH),master) - $(error Please make the release from master branch\n) +.PHONY: check-main +check-main: ## Check if we are in main branch +ifneq ($(CURRENT_BRANCH),main) + $(error Please make the release from main branch\n) endif .PHONY: check-history @@ -136,13 +136,13 @@ ifeq ($(CHANGELOG_LINES),0) endif .PHONY: check-release -check-release: check-master check-history ## Check if the release can be made +check-release: check-main check-history ## Check if the release can be made .PHONY: release release: check-release bumpversion-release publish bumpversion-patch .PHONY: release-candidate -release-candidate: check-master publish bumpversion-candidate +release-candidate: check-main publish bumpversion-candidate .PHONY: release-minor release-minor: check-release bumpversion-minor release diff --git a/pygridsim.egg-info/PKG-INFO b/pygridsim.egg-info/PKG-INFO deleted file mode 100644 index e2dd3db..0000000 --- a/pygridsim.egg-info/PKG-INFO +++ /dev/null @@ -1,140 +0,0 @@ -Metadata-Version: 2.1 -Name: pygridsim -Version: 0.1.0.dev0 -Summary: Package to simulate OpenDSS circuits on Python -Home-page: https://github.com/amzhao/PyGridSim -Author: Angela Zhao -Author-email: amzhao@mit.edu -License: MIT license -Keywords: pygridsim pygridsim PyGridSim -Classifier: Development Status :: 2 - Pre-Alpha -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Natural Language :: English -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 -Classifier: Programming Language :: Python :: 3.6 -Classifier: Programming Language :: Python :: 3.7 -Classifier: Programming Language :: Python :: 3.8 -Requires-Python: >=3.5 -Description-Content-Type: text/markdown -License-File: LICENSE -Provides-Extra: test -Requires-Dist: pytest>=3.4.2; extra == "test" -Requires-Dist: pytest-cov>=2.6.0; extra == "test" -Provides-Extra: dev -Requires-Dist: bumpversion>=0.5.3; extra == "dev" -Requires-Dist: pip>=9.0.1; extra == "dev" -Requires-Dist: watchdog>=0.8.3; extra == "dev" -Requires-Dist: m2r<0.3,>=0.2.0; extra == "dev" -Requires-Dist: Sphinx<3,>=1.7.1; extra == "dev" -Requires-Dist: sphinx_rtd_theme<0.5,>=0.2.4; extra == "dev" -Requires-Dist: autodocsumm>=0.1.10; extra == "dev" -Requires-Dist: flake8>=3.7.7; extra == "dev" -Requires-Dist: isort>=4.3.4; extra == "dev" -Requires-Dist: autoflake>=1.2; extra == "dev" -Requires-Dist: autopep8>=1.4.3; extra == "dev" -Requires-Dist: twine>=1.10.0; extra == "dev" -Requires-Dist: wheel>=0.30.0; extra == "dev" -Requires-Dist: coverage>=4.5.1; extra == "dev" -Requires-Dist: tox>=2.9.1; extra == "dev" -Requires-Dist: pytest>=3.4.2; extra == "dev" -Requires-Dist: pytest-cov>=2.6.0; extra == "dev" - -

-“DAI-Lab” -An open source project from Data to AI Lab at MIT. -

- - - - -[![Github Actions Shield](https://img.shields.io/github/workflow/status/amzhao/PyGridSim/Run%20Tests)](https://github.com/amzhao/PyGridSim/actions) -[![Coverage Status](https://codecov.io/gh/amzhao/PyGridSim/branch/master/graph/badge.svg)](https://codecov.io/gh/amzhao/PyGridSim) - - - -# PyGridSim - -Package to simulate OpenDSS circuits on Python - -- Documentation: https://amzhao.github.io/PyGridSim -- Homepage: https://github.com/amzhao/PyGridSim - -# Overview - -TODO: Provide a short overview of the project here. - -# Install - -## Requirements - -**PyGridSim** has been developed and tested on [Python 3.5, 3.6, 3.7 and 3.8](https://www.python.org/downloads/) - -Also, although it is not strictly required, the usage of a [virtualenv](https://virtualenv.pypa.io/en/latest/) -is highly recommended in order to avoid interfering with other software installed in the system -in which **PyGridSim** is run. - -These are the minimum commands needed to create a virtualenv using python3.6 for **PyGridSim**: - -```bash -pip install virtualenv -virtualenv -p $(which python3.6) PyGridSim-venv -``` - -Afterwards, you have to execute this command to activate the virtualenv: - -```bash -source PyGridSim-venv/bin/activate -``` - -Remember to execute it every time you start a new console to work on **PyGridSim**! - - - -## Install from source - -With your virtualenv activated, you can clone the repository and install it from -source by running `make install` on the `stable` branch: - -```bash -git clone git@github.com:amzhao/PyGridSim.git -cd PyGridSim -git checkout stable -make install -``` - -## Install for Development - -If you want to contribute to the project, a few more steps are required to make the project ready -for development. - -Please head to the [Contributing Guide](https://amzhao.github.io/PyGridSim/contributing.html#get-started) -for more details about this process. - -# Quickstart - -In this short tutorial we will guide you through a series of steps that will help you -getting started with **PyGridSim**. - -TODO: Create a step by step guide here. - -# What's next? - -For more details about **PyGridSim** and all its possibilities -and features, please check the [documentation site]( -https://amzhao.github.io/PyGridSim/). - - -# History diff --git a/pygridsim.egg-info/SOURCES.txt b/pygridsim.egg-info/SOURCES.txt deleted file mode 100644 index ee2ccb5..0000000 --- a/pygridsim.egg-info/SOURCES.txt +++ /dev/null @@ -1,24 +0,0 @@ -CONTRIBUTING.rst -HISTORY.md -LICENSE -MANIFEST.in -README.md -setup.cfg -setup.py -docs/Makefile -docs/conf.py -docs/contributing.rst -docs/history.rst -docs/index.rst -docs/make.bat -docs/readme.rst -docs/images/dai-logo-white-200.png -pygridsim/__init__.py -pygridsim/pygridsim.py -pygridsim.egg-info/PKG-INFO -pygridsim.egg-info/SOURCES.txt -pygridsim.egg-info/dependency_links.txt -pygridsim.egg-info/not-zip-safe -pygridsim.egg-info/requires.txt -pygridsim.egg-info/top_level.txt -tests/test_pygridsim.py \ No newline at end of file diff --git a/pygridsim.egg-info/dependency_links.txt b/pygridsim.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/pygridsim.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pygridsim.egg-info/not-zip-safe b/pygridsim.egg-info/not-zip-safe deleted file mode 100644 index 8b13789..0000000 --- a/pygridsim.egg-info/not-zip-safe +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pygridsim.egg-info/requires.txt b/pygridsim.egg-info/requires.txt deleted file mode 100644 index d23a788..0000000 --- a/pygridsim.egg-info/requires.txt +++ /dev/null @@ -1,23 +0,0 @@ - -[dev] -bumpversion>=0.5.3 -pip>=9.0.1 -watchdog>=0.8.3 -m2r<0.3,>=0.2.0 -Sphinx<3,>=1.7.1 -sphinx_rtd_theme<0.5,>=0.2.4 -autodocsumm>=0.1.10 -flake8>=3.7.7 -isort>=4.3.4 -autoflake>=1.2 -autopep8>=1.4.3 -twine>=1.10.0 -wheel>=0.30.0 -coverage>=4.5.1 -tox>=2.9.1 -pytest>=3.4.2 -pytest-cov>=2.6.0 - -[test] -pytest>=3.4.2 -pytest-cov>=2.6.0 diff --git a/pygridsim.egg-info/top_level.txt b/pygridsim.egg-info/top_level.txt deleted file mode 100644 index ade4998..0000000 --- a/pygridsim.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -pygridsim diff --git a/pygridsim/__init__.py b/pygridsim/__init__.py index 6b8f757..8aea3b5 100644 --- a/pygridsim/__init__.py +++ b/pygridsim/__init__.py @@ -4,6 +4,6 @@ __author__ = 'Angela Zhao' __email__ = 'amzhao@mit.edu' -__version__ = '0.1.0.dev0' +__version__ = '0.1.0.dev1' from pygridsim.core import PyGridSim \ No newline at end of file diff --git a/pygridsim/__pycache__/__init__.cpython-312.pyc b/pygridsim/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 79ee472..0000000 Binary files a/pygridsim/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/core.cpython-310.pyc b/pygridsim/__pycache__/core.cpython-310.pyc deleted file mode 100644 index 513ff90..0000000 Binary files a/pygridsim/__pycache__/core.cpython-310.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/core.cpython-312.pyc b/pygridsim/__pycache__/core.cpython-312.pyc deleted file mode 100644 index 8705a4e..0000000 Binary files a/pygridsim/__pycache__/core.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/defaults.cpython-310.pyc b/pygridsim/__pycache__/defaults.cpython-310.pyc deleted file mode 100644 index 2dfa6f4..0000000 Binary files a/pygridsim/__pycache__/defaults.cpython-310.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/defaults.cpython-312.pyc b/pygridsim/__pycache__/defaults.cpython-312.pyc deleted file mode 100644 index 67412c2..0000000 Binary files a/pygridsim/__pycache__/defaults.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/enums.cpython-312.pyc b/pygridsim/__pycache__/enums.cpython-312.pyc deleted file mode 100644 index 572b725..0000000 Binary files a/pygridsim/__pycache__/enums.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/lines.cpython-310.pyc b/pygridsim/__pycache__/lines.cpython-310.pyc deleted file mode 100644 index 79b0642..0000000 Binary files a/pygridsim/__pycache__/lines.cpython-310.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/lines.cpython-312.pyc b/pygridsim/__pycache__/lines.cpython-312.pyc deleted file mode 100644 index d3217b0..0000000 Binary files a/pygridsim/__pycache__/lines.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/parameters.cpython-310.pyc b/pygridsim/__pycache__/parameters.cpython-310.pyc deleted file mode 100644 index aa82447..0000000 Binary files a/pygridsim/__pycache__/parameters.cpython-310.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/parameters.cpython-312.pyc b/pygridsim/__pycache__/parameters.cpython-312.pyc deleted file mode 100644 index ebc049c..0000000 Binary files a/pygridsim/__pycache__/parameters.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/queries.cpython-310.pyc b/pygridsim/__pycache__/queries.cpython-310.pyc deleted file mode 100644 index 90b2c3d..0000000 Binary files a/pygridsim/__pycache__/queries.cpython-310.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/queries.cpython-312.pyc b/pygridsim/__pycache__/queries.cpython-312.pyc deleted file mode 100644 index 95f5707..0000000 Binary files a/pygridsim/__pycache__/queries.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/results.cpython-312.pyc b/pygridsim/__pycache__/results.cpython-312.pyc deleted file mode 100644 index 7220998..0000000 Binary files a/pygridsim/__pycache__/results.cpython-312.pyc and /dev/null differ diff --git a/pygridsim/__pycache__/transformers.cpython-312.pyc b/pygridsim/__pycache__/transformers.cpython-312.pyc deleted file mode 100644 index f41f426..0000000 Binary files a/pygridsim/__pycache__/transformers.cpython-312.pyc and /dev/null differ diff --git a/setup.cfg b/setup.cfg index e60b664..865b6f4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,16 +1,16 @@ [bumpversion] -current_version = 0.1.0.dev0 +current_version = 0.1.0.dev1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? -serialize = +serialize = {major}.{minor}.{patch}.{release}{candidate} {major}.{minor}.{patch} [bumpversion:part:release] optional_value = release first_value = dev -values = +values = dev release @@ -30,14 +30,11 @@ universal = 1 [flake8] max-line-length = 99 exclude = docs, .tox, .git, __pycache__, .ipynb_checkpoints -# Ignore W503 (line break before binary operator) -# Line breaks should occur before the binary operator because it keeps all operators aligned. -# Please discuss with the group before adding other ignores. -ignore = W503 +ignore = W503 [isort] include_trailing_comma = True -line_length=99 +line_length = 99 lines_between_types = 0 multi_line_output = 4 not_skip = __init__.py diff --git a/setup.py b/setup.py index ac2afcf..d8e1719 100644 --- a/setup.py +++ b/setup.py @@ -86,6 +86,6 @@ test_suite='tests', tests_require=tests_require, url='https://github.com/amzhao/PyGridSim', - version='0.1.0.dev0', + version='0.1.0.dev1', zip_safe=False, ) diff --git a/tests/__pycache__/test_circuit.cpython-312.pyc b/tests/__pycache__/test_circuit.cpython-312.pyc deleted file mode 100644 index 0f910c1..0000000 Binary files a/tests/__pycache__/test_circuit.cpython-312.pyc and /dev/null differ diff --git a/tests/__pycache__/test_pygridsim.cpython-312.pyc b/tests/__pycache__/test_pygridsim.cpython-312.pyc deleted file mode 100644 index 81a7d5c..0000000 Binary files a/tests/__pycache__/test_pygridsim.cpython-312.pyc and /dev/null differ