From 8b2bcbd27568c81c5be872fee6d819bfca9174b9 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Fri, 7 Jun 2024 08:49:58 +0000 Subject: [PATCH 1/4] updated ci pipelines --- .github/workflows/anaconda.yaml | 4 ++-- .github/workflows/publish_pypi.yaml | 6 +++--- .github/workflows/python-package-conda.yaml | 4 ++-- .github/workflows/python-package.yaml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/anaconda.yaml b/.github/workflows/anaconda.yaml index 899955b..f5d09ae 100644 --- a/.github/workflows/anaconda.yaml +++ b/.github/workflows/anaconda.yaml @@ -9,11 +9,11 @@ jobs: strategy: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Create build environment - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: activate-environment: gc-meox-tms-build auto-update-conda: true diff --git a/.github/workflows/publish_pypi.yaml b/.github/workflows/publish_pypi.yaml index 7bfbb5b..bd77da4 100644 --- a/.github/workflows/publish_pypi.yaml +++ b/.github/workflows/publish_pypi.yaml @@ -9,9 +9,9 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.8' - name: Install dependencies @@ -20,7 +20,7 @@ jobs: pip install build python -m build --sdist --wheel - name: Publish package - uses: pypa/gh-action-pypi-publish@release/v1.5 + uses: pypa/gh-action-pypi-publish@release/v1.8 with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/.github/workflows/python-package-conda.yaml b/.github/workflows/python-package-conda.yaml index 186f700..9ff7beb 100644 --- a/.github/workflows/python-package-conda.yaml +++ b/.github/workflows/python-package-conda.yaml @@ -9,9 +9,9 @@ jobs: max-parallel: 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.8 - name: Add conda to PATH diff --git a/.github/workflows/python-package.yaml b/.github/workflows/python-package.yaml index dfd7f0c..213b828 100644 --- a/.github/workflows/python-package.yaml +++ b/.github/workflows/python-package.yaml @@ -11,9 +11,9 @@ jobs: python-version: ['3.8', '3.9', '3.10'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -42,7 +42,7 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Pull coverage report uses: actions/download-artifact@v2 with: From 6996df9ef822f9bacdbf2d06cb9403366b3be7b2 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Fri, 7 Jun 2024 08:52:05 +0000 Subject: [PATCH 2/4] updated python versions --- .github/workflows/anaconda.yaml | 2 +- .github/workflows/python-package-conda.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/anaconda.yaml b/.github/workflows/anaconda.yaml index f5d09ae..2ea288e 100644 --- a/.github/workflows/anaconda.yaml +++ b/.github/workflows/anaconda.yaml @@ -18,7 +18,7 @@ jobs: activate-environment: gc-meox-tms-build auto-update-conda: true environment-file: conda/environment-build.yaml - python-version: 3.8 + python-version: 3.10 - name: Show conda config shell: bash -l {0} run: | diff --git a/.github/workflows/python-package-conda.yaml b/.github/workflows/python-package-conda.yaml index 9ff7beb..47d4daa 100644 --- a/.github/workflows/python-package-conda.yaml +++ b/.github/workflows/python-package-conda.yaml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.10 - name: Add conda to PATH run: | echo $CONDA/bin >> $GITHUB_PATH From 0e3e480bf920c690c3d9012ff1df929444dff00c Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Fri, 7 Jun 2024 08:55:52 +0000 Subject: [PATCH 3/4] python versions as string --- .github/workflows/anaconda.yaml | 2 +- .github/workflows/python-package-conda.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/anaconda.yaml b/.github/workflows/anaconda.yaml index 2ea288e..f5d09ae 100644 --- a/.github/workflows/anaconda.yaml +++ b/.github/workflows/anaconda.yaml @@ -18,7 +18,7 @@ jobs: activate-environment: gc-meox-tms-build auto-update-conda: true environment-file: conda/environment-build.yaml - python-version: 3.10 + python-version: 3.8 - name: Show conda config shell: bash -l {0} run: | diff --git a/.github/workflows/python-package-conda.yaml b/.github/workflows/python-package-conda.yaml index 47d4daa..e20a7a9 100644 --- a/.github/workflows/python-package-conda.yaml +++ b/.github/workflows/python-package-conda.yaml @@ -13,7 +13,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: '3.10' - name: Add conda to PATH run: | echo $CONDA/bin >> $GITHUB_PATH From a61955dd775a26c43c5521cb5fbcfcc0264f605b Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Fri, 7 Jun 2024 09:09:42 +0000 Subject: [PATCH 4/4] added conda update conda to list --- .github/workflows/python-package-conda.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-package-conda.yaml b/.github/workflows/python-package-conda.yaml index e20a7a9..fa27e35 100644 --- a/.github/workflows/python-package-conda.yaml +++ b/.github/workflows/python-package-conda.yaml @@ -19,6 +19,7 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Install dependencies run: | + conda update conda conda env update --file conda/environment-dev.yaml --name base - name: Lint with flake8 run: |