Skip to content

Commit

Permalink
add travis and license
Browse files Browse the repository at this point in the history
  • Loading branch information
ccoffrin committed Sep 23, 2018
1 parent ec2aaa7 commit 72dbfb2
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 6 deletions.
26 changes: 26 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
language: python
os:
- linux
python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
install:
- pip install tox-travis
- pip install codecov
- pip install grg-pssedata grg-grgdata # needed for check version
script:
- tox
- "./check_version.py"
after_success:
- codecov
deploy:
- provider: pypi
user: ccoffrin
password:
secure: On3kYMtAgaFXq6tX8+83SEaTSGeZk5HeT22S+Oz/IamoRTSllRU3SLu2/OKHpX+ARxSDyxTKKBUcYGBDZIAImK0QhZgMMuRZ9Wt/ApGQy2rnOpN56hWnRStXSWF4AxXuvAWG0G+w7um1Ea2sKXBNF6vW7zncvQmif8kXm4TIwHdAUzS3/JR+E2JBshi+/JCCD+fA2H2+c/nPU9ym1Y3kQ0WnOYVzjPD5yZ677dZSWZ+qVNc9g4k++HsVsHlIDF65a37vkwsJ9NoIac0MjtTFZj1T7WrhtWAJo/nH4H/JD/H/rM1CujZIbEHD95r3QDGbJ207s/HG+eYnppR92t8ksPqmkYPhKfc3RMrkrMuzlQ4uWsASIrPeFfJmhEwcUxBCl50oE+oAR7SQ5+MkKmILn0RtjZfN1qQ3yrahYpbXsKH2rgBFmAdZmwcBQ3H9dtIit0luhAGKAnSe1PZBHEd6GDerfSBniQhdMmVbg/kf11EUIhNqwP/HNTN6v99IgJEbE4SNG58iCZ8nnXJJiOjvQaelaUPdZArgRsbb2sWdyBJbTSlwumQ9Y6IY0kTQ6Bvxsmh7g9uDdqEnds8BL3yW7p4d7pZN7UqwshMyd8VEd8E2jTqwI5NhNoynPhPbNkB6pP1J3vcAeZx7B+wwetOZotTQ8gydN38vPbrC7xMNAt4=
on:
tags: true
branch: master
condition: "$TRAVIS_PYTHON_VERSION = '3.6'"
42 changes: 42 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
This software is open source software available under the BSD-3 license.

Copyright (c) 2018 Los Alamos National Security, LLC.
All rights reserved.

Copyright 2018. Los Alamos National Security, LLC. This software was produced
under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
Laboratory (LANL), which is operated by Los Alamos National Security, LLC for
the U.S. Department of Energy. The U.S. Government has rights to use,
reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS ALAMOS
NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY
LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified to produce
derivative works, such modified software should be clearly marked, so as not
to confuse it with the version available from LANL.

Additionally, redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following conditions
are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of Los Alamos National Security, LLC, Los Alamos National
Laboratory, LANL, the U.S. Government, nor the names of its contributors may be
used to endorse or promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ grg-psse2grg is designed to be a library that supports other software.
It is not immediately useful from the terminal.
However, you can test the parsing functionality from the command line with::

python -m grg_psse2grg.io <path to Matpower or GRG case file>
python -m grg_psse2grg.io <path to PSSE or GRG case file>

If this command is successful, you will see a translated plain text version of the translated network data printed to the terminal.

Expand Down
10 changes: 5 additions & 5 deletions grg_psse2grg/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -1297,11 +1297,11 @@ def build_cli_parser():
epilog='''Please file bugs at...''',
)
parser.add_argument('file', help='the data file to operate on (.raw|.json)')
parser.add_argument('-spm', '--starting-point-mapping', help='a grg starting point mapping to be use as a basis for the matpower case', default='starting_points')
parser.add_argument('-sam', '--switch-assignment-mapping', help='a grg switch mapping to be use as a basis for the matpower case', default='breakers_assignment')
parser.add_argument('-i', '--idempotent', help='tests the translation of a given matpower file is idempotent', action='store_true')
parser.add_argument('-os', '--omit-subtypes', help='ommits optional component subtypes when translating from matpower to grg', default=False, action='store_true')
parser.add_argument('-sv', '--skip-validation', help='skips the grg validation step when translating from matpower to grg', default=False, action='store_true')
parser.add_argument('-spm', '--starting-point-mapping', help='a grg starting point mapping to be use as a basis for the psse case', default='starting_points')
parser.add_argument('-sam', '--switch-assignment-mapping', help='a grg switch mapping to be use as a basis for the psse case', default='breakers_assignment')
parser.add_argument('-i', '--idempotent', help='tests the translation of a given psse file is idempotent', action='store_true')
parser.add_argument('-os', '--omit-subtypes', help='ommits optional component subtypes when translating from psse to grg', default=False, action='store_true')
parser.add_argument('-sv', '--skip-validation', help='skips the grg validation step when translating from psse to grg', default=False, action='store_true')

#parser.add_argument('--foo', help='foo help')
version = __import__('grg_psse2grg').__version__
Expand Down

0 comments on commit 72dbfb2

Please sign in to comment.