Merge branch 'release/v0.2.15'

.gitignore

@@ -4,14 +4,23 @@
 *.csv
 *.html
 
+# source archives
+*.tar.gz
+
 # Affinity Designer documents
 *.afdesign
 
 # compiled files
 *.py[cod]
 
+# shared libraries
+*.dll
+*.dylib
+*.so
+
 # build artifacts
 build/
+cvode-*/
 dist/
 MANIFEST
 *.egg-info

OverrideMSVCFlags.cmake

@@ -0,0 +1,8 @@
+if (MSVC)
+  # link statically against the Visual C runtime
+  set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING INTERNAL FORCE)
+
+  set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /DNDEBUG")
+  message("Updated CMAKE_C_FLAGS_RELEASE:")
+  message("${CMAKE_C_FLAGS_RELEASE}")
+endif ()

README.md

@@ -1,6 +1,3 @@
-[![Linux](https://img.shields.io/circleci/project/github/CATIA-Systems/FMPy/master.svg?label=Linux&logo=circleci)](https://circleci.com/gh/CATIA-Systems/FMPy)
-[![OSX](https://img.shields.io/travis/CATIA-Systems/FMPy/master.svg?label=macOS&logo=travis)](https://travis-ci.org/CATIA-Systems/FMPy)
-[![Windows](https://img.shields.io/appveyor/ci/TorstenSommer/FMPy/master.svg?label=Windows&logo=appveyor)](https://ci.appveyor.com/project/TorstenSommer/FMPy/branch/master)
 [![Build Status](https://dev.azure.com/CATIA-Systems/FMPy/_apis/build/status/CATIA-Systems.FMPy?branchName=develop)](https://dev.azure.com/CATIA-Systems/FMPy/_build/latest?definitionId=1&branchName=develop)
 [![PyPI](https://img.shields.io/pypi/dm/FMPy.svg?label=PyPI%20downloads)](https://pypi.org/project/FMPy/)
 [![Conda](https://img.shields.io/conda/dn/conda-forge/FMPy.svg?label=Conda%20downloads)](https://anaconda.org/conda-forge/fmpy)
@@ -103,6 +100,12 @@ To learn more about how to use FMPy in you own scripts take a look at the
 [custom_input.py](fmpy/examples/custom_input.py) and
 [parameter_variation.py](fmpy/examples/parameter_variation.py) examples.
 
+## Commercial Support
+
+You're starting a project, need training or professional support?
+Our partners at LTX Simulation are ready to help you.
+Please send an e-mail to [email protected] for a quote.
+
 ------------------------------------
 
 © 2018 Dassault Systèmes

azure-pipelines.yml

@@ -19,7 +19,7 @@ jobs:
 
   - bash: |
       source activate myEnvironment
-      conda install --yes --quiet --name myEnvironment -c conda-forge python=$PYTHON_VERSION dask lxml matplotlib numpy pathlib pyqt pyqtgraph pytest-cov requests
+      conda install --yes --quiet --name myEnvironment -c conda-forge python=$PYTHON_VERSION cmake dask lark-parser lxml matplotlib numpy pathlib pyqt pyqtgraph pytest-cov requests
     displayName: Install Anaconda packages
 
   - bash: |
@@ -45,6 +45,11 @@ jobs:
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
       reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
 
+  - task: PublishPipelineArtifact@1
+    inputs:
+      path: dist
+      artifact: 'linux-python-$(python.version)'
+
 - job:
   displayName: 'macOS 10.13'
   strategy:
@@ -71,7 +76,7 @@ jobs:
 
   - bash: |
       source activate myEnvironment
-      conda install --yes --quiet --name myEnvironment -c conda-forge python=$PYTHON_VERSION dask lxml matplotlib numpy pathlib pyqt pyqtgraph pytest-cov requests
+      conda install --yes --quiet --name myEnvironment -c conda-forge python=$PYTHON_VERSION dask lark-parser lxml matplotlib numpy pathlib pyqt pyqtgraph pytest-cov requests
     displayName: Install Anaconda packages
 
   - bash: |
@@ -97,6 +102,11 @@ jobs:
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
       reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
 
+  - task: PublishPipelineArtifact@1
+    inputs:
+      path: dist
+      artifact: 'macosx-python-$(python.version)'
+
 - job:
   displayName: 'Windows 2016'
   strategy:
@@ -118,23 +128,33 @@ jobs:
 
   - script: |
       call activate myEnvironment
-      conda install --yes --quiet --name myEnvironment -c conda-forge python=%PYTHON_VERSION% cmake dask lxml matplotlib numpy pathlib pyqt pyqtgraph pytest-cov pywin32 requests
+      conda install --yes --quiet --name myEnvironment -c conda-forge python=%PYTHON_VERSION% cmake dask lark-parser lxml matplotlib numpy pathlib pyqt pyqtgraph pytest-cov pywin32 requests
     displayName: Install Anaconda packages
 
   - script: |
       call activate myEnvironment
       python setup.py bdist_wheel --universal
+    displayName: Build wheel
+
+  - task: PublishPipelineArtifact@1
+    inputs:
+      path: dist
+      artifact: 'windows-python-$(python.version)'
+
+  - script: |
+      call activate myEnvironment
       for %%f in (dist\FMPy-*.whl) do pip install %%f --no-deps
       cd tests
       pytest --junitxml=junit/test-results.xml --cov=fmpy --cov-report=xml --cov-report=html
       cd ..
-    displayName: Build, install and run tests
+    displayName: Install wheel and run tests
 
   - task: PublishTestResults@2
     condition: succeededOrFailed()
     inputs:
       testResultsFiles: '**/test-*.xml'
       testRunTitle: 'Publish test results for Python $(python.version)'
+      failTaskOnFailedTests: true
 
   - task: PublishCodeCoverageResults@1
     inputs:

docs/changelog.md

@@ -1,3 +1,34 @@
+## v0.2.15 (2019-12-18)
+
+- `FIXED` validation of structured variable names with apostrophes
+- `FIXED` dimensions of variables in FMI 3
+- `NEW` validation of "flat" variable names
+- `UPDATED` FMI 3 schema files
+- `UPDATED` CVode 5.0
+- `IMPROVED` optional files added to CMake projects for source FMUs
+- `IMPROVED` NULL pointers are now ignored in freeMemory()
+- `IMPROVED` frequently used utility functions are now imported to fmpy module
+- `IMPROVED` parameter_variation adapted to new Dask versions
+
+## v0.2.14 (2019-10-23)
+
+Improved validation & --visible option for CLI
+
+- `FIXED` "Load Start Values" only enabled when FMU can be simulated
+- `NEW` --visible option in CLI
+- `NEW` XML line numbers added to validation messages
+- `NEW` validation of variables names for naming convention "structured"
+- `IMPROVED` visible=fmi2True when simulating in GUI
+
+## v0.2.13 (2019-09-16)
+
+Extended FMI 3.0 alpha 2 support & improved GUI
+
+- `NEW` check for illegal filenames in FMU archives
+- `NEW` reload button in GUI
+- `IMPROVED` extended FMI 3.0 alpha 2 support
+- `CHANGED` increased max. filesize for Cross-Check FMUs
+
 ## v0.2.12 (2019-07-15)
 
 Support for FMI 3.0 Alpha 1, output interval in GUI
@@ -26,7 +57,7 @@ Experimental FMI 3.0 support, FMI Cross-Check validation scripts
 
 - `FIXED` set start values before entering initialization mode
 - `NEW` experimental FMI 3.0 support
-- `NEW` FMI Cross-Check validation scripts to validate FMUs and results 
+- `NEW` FMI Cross-Check validation scripts to validate FMUs and results
 - `IMPROVED` handling of reference signals with duplicate sample times
 
 ## v0.2.9 (2019-02-07)

docs/contributing.md

@@ -5,7 +5,7 @@ the preferred channel for [bug reports](#bug-reports) and [features requests](#f
 but please respect the following restriction:
 
 * Please **do not** use the issue tracker for personal support requests.
-  [Stack Overflow](https://stackoverflow.com/) is a better place to get help.
+  [Stack Overflow](https://stackoverflow.com/) or [commercial support](../README.md#commercial-support) are better places to get help.
 
 
 ## Bug reports