Skip to content

Commit

Permalink
Merge pull request #41 from lanl-ansi/im-updates
Browse files Browse the repository at this point in the history
Updates for IM v0.5, PM v0.17, and GM v0.7
  • Loading branch information
rb004f authored Jul 31, 2020
2 parents d9f7495 + f660438 commit a3a0f0d
Show file tree
Hide file tree
Showing 111 changed files with 1,965 additions and 12,196 deletions.
13 changes: 11 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
bin
src/scratch
.DS_Store
Manifest.toml
*.jl.cov
*.jl.*.cov
*.jl.mem
deps/deps.jl
docs/build/
docs/site/
docs/.documenter
.project
.tags
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@ os:
- osx
julia:
- 1.0
- 1.1
- 1.4
- nightly
matrix:
codecov: true
jobs:
allow_failures:
- julia: nightly
after_success:
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
jobs:
include:
- stage: "Documentation"
julia: 1.1
julia: 1.4
os: linux
script:
- julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))'
Expand Down
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Comments, Questions, Feature Requests, Bug Reports
At this time, any kind of comment, question, feature request, or bug report is welcome in the issue tracker.
If you are asking a question, please search the issues for an answer before making a post.

## Code Contributions
Community-driven development and enhancement of GasPowerModels is welcomed and encouraged.
Please feel free to fork this repository and share your contributions to the master branch with a pull request.
That said, it is important to keep in mind the code quality requirements and scope of GasPowerModels before preparing a contribution.

### GasPowerModels Scope
The primary motivation for GasPowerModels is to help researchers quickly and easily construct coupled gas and power network optimization models.
Preliminary research and development efforts are best left to other packages that extend GasPowerModels.
That said, the GasPowerModels package should have a software design that makes building such extensions as easy as possible.

### Code Quality Requirements
GasPowerModels strives to be a user-friendly, highly-reliable, and well-maintained package.
To that end, the following code quality controls are necessary for all contributions:
- All features must have unit tests.
- Naming conventions must be consistent.
- Core features must have documentation.
- Code style must be consistent (e.g., four spaces for indentation).

Due to these quality control requirements, pull requests to GasPowerModels may require lengthy discussion and code review.
238 changes: 0 additions & 238 deletions Manifest.toml

This file was deleted.

12 changes: 6 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ name = "GasPowerModels"
uuid = "1fcaf345-95e3-5b8b-91d6-2145eb844b9d"
authors = ["Russell Bent"]
repo = "https://github.com/lanl-ansi/GasPowerModels.jl"
version = "0.1.1"
version = "0.2.0"

[deps]
GasModels = "5e113713-6c35-5477-b766-e1109486666f"
InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Memento = "f28f55f0-a522-5efc-85c2-fe41dfb9b2d9"
PowerModels = "c36e90e8-916a-50a6-bd94-075b64ef4655"

[compat]
GasModels = "~0.4"
InfrastructureModels = "~0.2"
JSON = ">= 0.18"
PowerModels = "~0.12"
GasModels = "~0.7"
JSON = "~0.18, ~0.19, ~0.20, ~0.21"
JuMP = "~0.21"
Memento = "~1.0, ~1.1"
PowerModels = "~0.17"
julia = "^1"

[extras]
Expand Down
Loading

0 comments on commit a3a0f0d

Please sign in to comment.