Skip to content

Commit

Permalink
Merge pull request #206 from NREL/dev
Browse files Browse the repository at this point in the history
v0.4.0
  • Loading branch information
jd-lara authored Sep 17, 2019
2 parents 570c5d0 + 009def2 commit 3c826c3
Show file tree
Hide file tree
Showing 152 changed files with 11,204 additions and 6,254 deletions.
6 changes: 4 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
environment:
matrix:
- julia_version: 1.1
- julia_version: 1.2
- julia_version: 1.3
- julia_version: latest

platform:
Expand All @@ -12,6 +13,7 @@ platform:
matrix:
allow_failures:
- julia_version: latest
- julia_version: 1.3

branches:
only:
Expand All @@ -33,4 +35,4 @@ build_script:

test_script:
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia --check-bounds=yes --color=yes --project -e "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia --check-bounds=yes --color=yes --project -e "%JL_TEST_SCRIPT%"
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Julia files
[*.jl]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
docs/build/*
.DS_Store
*.R
*.PNG
*.csv
*.ipynb
*.log
*.m
*.RAW
*.zip
*.json
data
*.bak
*~
*.vscode
src/descriptors/validation_config.*
docs/src/man/data_requirements_table.md
/docs/Manifest.toml
20 changes: 8 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ os:
- linux
- osx
julia:
- 1.1
- 1.2
- 1.3
- nightly


codecov: true

notifications:
email: false

Expand All @@ -25,21 +29,13 @@ matrix:
#before_script: # homebrew for mac
# - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi

## uncomment the following lines to override the default test script
script:
- julia --project --color=yes -e "import Pkg; Pkg.instantiate(); Pkg.build();"
- julia --check-bounds=yes --depwarn=no --color=yes --project -e "import Pkg; Pkg.test(coverage=true);"

after_success:
- julia -e 'using Pkg; cd(Pkg.dir("PowerSystems")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

jobs:
include:
- stage: "Documentation"
julia: 1.0
julia: 1.2
os: linux
script:
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.build("PowerSystems"); Pkg.instantiate()'
- DOCUMENTER_DEBUG=true julia --project=docs/ docs/make.jl
- julia --project=docs -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()));'
- julia --project=docs --color=yes -e 'include("docs/make.jl")'
after_success: skip

257 changes: 0 additions & 257 deletions Manifest.toml

This file was deleted.

Loading

2 comments on commit 3c826c3

@jd-lara
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register(branch="master")

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/3612

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.4.0 -m "<description of version>" 3c826c3512b658bf49c49517311b7af74eaa3d18
git push origin v0.4.0

Please sign in to comment.