tsam 2.3.2__tar.gz → 2.3.4__tar.gz

tsam-2.3.2/.github/workflows/pytest.yml → tsam-2.3.4/.github/workflows/daily_tests.yml

@@ -1,43 +1,48 @@
-# This workflow will install Python dependencies and run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-# Based on David Neuroth pylpg
-
-name: pytest
-
-on:
-  push:
-  pull_request:
-    branches: [ master ]
-#if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-
-jobs:
-  build:
-    runs-on: ${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest","ubuntu-20.04", "macos-latest","macos-13","macos-12", "windows-latest","windows-2019"]
-        # os: ["ubuntu-latest"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{matrix.python-version}}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install pytest
-        pip install pytest-cov
-        pip install codecov
-        pip install -r requirements.txt
-        pip install --no-cache-dir -e .
-        
-    - name: Test with pytest
-      working-directory: ./test/
-      run: |
-        pytest
-        codecov
+# This tests are run daily to check incompatibilties introduced by new versions of dependencies
+name: Daily tsam tests
+on:
+  # Enables manual start
+  workflow_dispatch:
+    inputs:
+      tags:
+        description: 'Manual run' 
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Some Examples for cron syntax https://crontab.guru/examples.html
+    # Schedules job at any point after 12 pm
+    - cron:  '0 0 * * *'
+    # Weekly after sunday
+    # - cron: 0 0 * * 0
+
+jobs:
+  DailyPythonAndOsTest:
+    name: Daily tests for Python ${{matrix.python-version}} on ${{matrix.os}}  
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest","ubuntu-20.04", "macos-latest","macos-13","macos-12", "windows-latest","windows-2019"]
+        # os: ["ubuntu-latest"]
+        python-version: [ "3.9", "3.10", "3.11", "3.12"]
+        
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{matrix.python-version}}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pytest
+        pip install pytest-cov
+        pip install codecov
+        pip install -r requirements.txt
+        pip install --no-cache-dir -e .
+        
+    - name: Test with pytest
+      working-directory: ./test/
+      run: |
+        pytest
+        codecov
+

tsam-2.3.4/.github/workflows/test_on_push_and_pull.yml

@@ -0,0 +1,71 @@
+# This workflow will install Python dependencies and run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+# Based on David Neuroth pylpg
+
+name: Test on Push and Pull
+
+on:
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  PythonAndOsTest:
+    name: Test for Python ${{matrix.python-version}} on ${{matrix.os}}  
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest","ubuntu-20.04", "macos-latest","macos-13","macos-12", "windows-latest","windows-2019"]
+        python-version: [ "3.9", "3.10", "3.11", "3.12"]
+        
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{matrix.python-version}}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pytest
+        pip install pytest-cov
+        pip install codecov
+        pip install -r requirements.txt
+        pip install --no-cache-dir -e .
+        
+    - name: Test with pytest
+      working-directory: ./test/
+      run: |
+        pytest
+        codecov
+
+  NumpyTest:
+    name: Test for numpy ${{matrix.python-numpy-version.numpy}} and python ${{matrix.python-numpy-version.python}}
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest","ubuntu-20.04", "macos-latest","macos-13","macos-12", "windows-latest","windows-2019"]
+        python-numpy-version: [ {python : 3.9,numpy : 1.25}, {python : 3.9,numpy : 1.26},{python : 3.9,numpy : 2.0}]        
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{matrix.python-numpy-version.python}}
+    - name: Install dependencies
+      run: |
+        python -m pip install numpy==${{matrix.python-numpy-version.numpy}} --upgrade pip
+        pip install pytest
+        pip install pytest-cov
+        pip install codecov
+        pip install -r requirements.txt
+        pip install --no-cache-dir -e .
+        
+    - name: Test with pytest
+      working-directory: ./test/
+      run: |
+        pytest
+        codecov

{tsam-2.3.2 → tsam-2.3.4}/.gitignore

@@ -1,17 +1,17 @@
-# directories
-.idea/
-.vscode/
-__pycache__/
-trash/
-*.pytest_cache/
-*ipynb_checkpoints/
-*.eggs/
-docs/build
-
-# file types to ignore
-*.pyc
-*.egg-info
-*.log
-*.lp
-*.glp
-*.mp4
+# directories
+.idea/
+.vscode/
+__pycache__/
+trash/
+*.pytest_cache/
+*ipynb_checkpoints/
+*.eggs/
+docs/build
+
+# file types to ignore
+*.pyc
+*.egg-info
+*.log
+*.lp
+*.glp
+*.mp4

{tsam-2.3.2 → tsam-2.3.4}/.gitlab-ci.yml

@@ -1,11 +1,11 @@
-conda:
-  image: continuumio/miniconda:latest
-  tags: 
-  - linux
-
-  script:
-    - conda env update -q --file=requirements.yml
-    - conda env update -q --file=requirements_dev.yml
-    - source activate tsam
-    - pip install -e .
-    - pytest --cov=tsam test/
+conda:
+  image: continuumio/miniconda:latest
+  tags: 
+  - linux
+
+  script:
+    - conda env update -q --file=requirements.yml
+    - conda env update -q --file=requirements_dev.yml
+    - source activate tsam
+    - pip install -e .
+    - pytest --cov=tsam test/

{tsam-2.3.2 → tsam-2.3.4}/.readthedocs.yml

@@ -1,15 +1,15 @@
-version: 2
-
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.11"
-  apt_packages:
-  - texlive-latex-base
-  - texlive-latex-extra
-  - dvipng
-
-python:
-  install:
-  - requirements: requirements_dev.txt
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+  apt_packages:
+  - texlive-latex-base
+  - texlive-latex-extra
+  - dvipng
+
+python:
+  install:
+  - requirements: requirements_dev.txt
   system_packages: false

{tsam-2.3.2 → tsam-2.3.4}/LICENSE.txt

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2017 Leander Kotzur (FZJ IEK-3), Maximilian Hoffmann (FZJ IEK-3), Peter Markewitz (FZJ IEK-3), Martin Robinius (FZJ IEK-3), Detlef Stolten (FZJ IEK-3)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2017 Leander Kotzur (FZJ IEK-3), Maximilian Hoffmann (FZJ IEK-3), Peter Markewitz (FZJ IEK-3), Martin Robinius (FZJ IEK-3), Detlef Stolten (FZJ IEK-3)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

{tsam-2.3.2 → tsam-2.3.4}/MANIFEST.in

@@ -1,3 +1,3 @@
-include examples/testdata.csv
-include examples/results/*.csv
-include requirements.yml
+include examples/testdata.csv
+include examples/results/*.csv
+include requirements.yml

tsam-2.3.4/Makefile

@@ -0,0 +1,27 @@
+#!make
+LOCAL_VENVS_DIR=~/.virtualenvs
+PROJECT_NAME=tsam
+PYTHON=python3.11
+LOCAL_VENV_DIR := ${LOCAL_VENVS_DIR}/${PROJECT_NAME}
+
+
+test:
+	. ${LOCAL_VENV_DIR}/bin/activate; pytest
+
+sdist:
+	. ${LOCAL_VENV_DIR}/bin/activate; ${PYTHON} setup.py sdist
+
+upload:
+	twine upload dist/*
+
+clean:
+	rm dist/*
+
+dist: sdist upload clean
+
+
+
+setup_venv:
+	mkdir -p  ${LOCAL_VENVS_DIR}
+	${PYTHON} -m venv ${LOCAL_VENV_DIR}
+	. ${LOCAL_VENV_DIR}/bin/activate; pip install -r requirements.txt; pip install -e .