Merge pull request #133 from ECSIM/develop

Version 1.2

.github/ISSUE_TEMPLATE.md

@@ -10,4 +10,4 @@
 
 #### Python Version
 
-#### OPEM Version
+#### OPEM Version (Use : `opem.__version__`)

.travis.yml

@@ -30,6 +30,10 @@ matrix:
         - os: linux
           python: nightly
           dist: xenial
+
+        - os: osx
+          language: generic
+          env: TOXENV=py36
 
     allow_failures:
         - os: linux
@@ -44,9 +48,11 @@ matrix:
           python: nightly
           dist: xenial
 install: 
+  - chmod +x .travis/install.sh
   - bash .travis/install.sh
 
 script: 
+  - chmod +x .travis/test.sh
   - bash .travis/test.sh
 
 after_success:

.travis/install.sh

@@ -1,6 +1,19 @@
 #!/bin/bash
 set -e
 set -x
-
-pip install -r requirements.txt
-python setup.py install
+PYTHON_COMMAND=python
+PIP_COMMAND=pip
+if [ "$TRAVIS_OS_NAME" == "osx" ]
+then
+	PYTHON_COMMAND=python3
+	PIP_COMMAND=pip3
+fi
+$PIP_COMMAND install -r requirements.txt
+$PYTHON_COMMAND setup.py install
+$PYTHON_COMMAND -m opem test
+if [ "$TRAVIS_OS_NAME" == "osx" ]
+then
+	$PIP_COMMAND install --upgrade --upgrade-strategy=only-if-needed -r dev-requirements.txt --user
+else
+	$PIP_COMMAND install --upgrade --upgrade-strategy=only-if-needed -r dev-requirements.txt
+fi

.travis/test.sh

@@ -2,15 +2,26 @@
 # Dump Environment (so that we can check PATH, UT_FLAGS, etc.)
 set -e
 set -x
+IS_IN_TRAVIS=false
+PYTHON_COMMAND=python
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]
+then
+	PYTHON_COMMAND=python3
+fi
+
+if [ "$CI" = 'true' ] && [ "$TRAVIS" = 'true' ]
+then
+     IS_IN_TRAVIS=true
+fi
 
-python -m opem test
-pip install -r dev-requirements.txt
-python version_check.py
-if [ "$TRAVIS_PYTHON_VERSION" = '3.6' ]
+if [ "$IS_IN_TRAVIS" = 'false' ] || [ "$TRAVIS_PYTHON_VERSION" = '3.7' ]
 then
-	python -m bandit -r opem -s B322
-	python -m vulture --min-confidence 80 --exclude=opem,build,.eggs --sort-by-size .
-	python -m pydocstyle
+	$PYTHON_COMMAND version_check.py
+	$PYTHON_COMMAND -m bandit -r opem -s B322
+	$PYTHON_COMMAND -m vulture --min-confidence 65 --sort-by-size opem setup.py version_check.py
+	$PYTHON_COMMAND -m pydocstyle
 fi
-python -m pytest opem/Test --cov=opem --cov-report=term
-python -m cProfile -s cumtime opem/Profile.py
+
+$PYTHON_COMMAND -m pytest opem/Test --cov=opem --cov-report=term
+$PYTHON_COMMAND -m cProfile -s cumtime opem/Profile.py

CHANGELOG.md

@@ -5,9 +5,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.2] - 2020-03-12
+### Added
+- `__version__` variable
+- `codecov.yml` file
 ### Changed
+- Icon updated
 - `AUTHORS.md` updated
 - `CONTRIBUTING.md` updated
+- Test system modified
+- `INSTALL.md` modified
+- CLI menu modified
+- Amphlett static model modified
+- Chamberline-Kim static model modified
+- Larminie-Dicks static model modified
+- Current range bug fixed
 ## [1.1] - 2019-07-05
 ### Added
 - MATLAB examples
@@ -153,7 +165,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - CSV output files
 - Documents and `README.md`
 
-[Unreleased]: https://github.com/ECSIM/opem/compare/v1.1...develop
+[Unreleased]: https://github.com/ECSIM/opem/compare/v1.2...develop
+[1.2]: https://github.com/ECSIM/opem/compare/v1.1...v1.2
 [1.1]: https://github.com/ECSIM/opem/compare/v1.0...v1.1
 [1.0]: https://github.com/ECSIM/opem/compare/v0.9...v1.0
 [0.9]: https://github.com/ECSIM/opem/compare/v0.8...v0.9