From d1cdb4199dc64391c7533cc6eaca9a39d63325ff Mon Sep 17 00:00:00 2001 From: Matthew Newville Date: Thu, 19 Oct 2023 09:40:34 -0500 Subject: [PATCH] more actions workflows work -- no mamba --- .github/workflows/test-ubuntu-mamba.yml | 39 ------------------------ .github/workflows/test-windows-mamba.yml | 37 ---------------------- .github/workflows/test-windows.yml | 1 - 3 files changed, 77 deletions(-) delete mode 100644 .github/workflows/test-ubuntu-mamba.yml delete mode 100644 .github/workflows/test-windows-mamba.yml diff --git a/.github/workflows/test-ubuntu-mamba.yml b/.github/workflows/test-ubuntu-mamba.yml deleted file mode 100644 index bbc71baf4..000000000 --- a/.github/workflows/test-ubuntu-mamba.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Test with Ubuntu, Mamba - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - strategy: - max-parallel: 5 - fail-fast: false - matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] - defaults: - run: - shell: bash -l {0} - steps: - - uses: actions/checkout@v4 - - name: Set up Python from Miniconda/conda - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - miniconda-version: latest - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true - activate-environment: anaconda-client-env - python-version: ${{ matrix.python-version }} - - name: Install conda dependencies - run: | - printenv - mamba install -y -c conda-forge python=${{ matrix.python-version }} numpy=>1.22 scipy=>1.8 matplotlib=>3.6 wxpython - mamba install -y -c conda-forge scikit-image scikit-learn pycifrw pandas jupyter plotly pyparsing pytest pytest-cov coverage - - name: Install xraylarch and other dependencies with pip - run: | - pip install lmfit peakutils pyepics pyshortcuts termcolor sphinx dill pycifrw xraydb wxmplot wxutils fabio silx imageio charset-normalizer - pip install . - - name: Run test suite - run: | - cd tests - python -m pytest diff --git a/.github/workflows/test-windows-mamba.yml b/.github/workflows/test-windows-mamba.yml deleted file mode 100644 index 7dfdd43f0..000000000 --- a/.github/workflows/test-windows-mamba.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Test with Windows, Mamba - -on: [push] - -jobs: - build: - runs-on: windows-latest - strategy: - max-parallel: 5 - fail-fast: false - matrix: - python-version: ['3.8.10', '3.9', '3.10', '3.11'] - steps: - - uses: actions/checkout@v4 - - name: Set up Python from Miniconda - uses: conda-incubator/setup-miniconda@v2.2.0 - with: - miniconda-version: latest - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true - activate-environment: anaconda-client-env - python-version: ${{ matrix.python-version }} - - name: Install conda dependencies - run: | - printenv - mamba install -y -c conda-forge python=${{ matrix.python-version }} numpy=>1.22 scipy=>1.8 matplotlib=>3.6 wxpython - mamba install -y -c conda-forge scikit-image scikit-learn pycifrw pandas jupyter plotly pyparsing pytest pytest-cov coverage - - name: Install xraylarch and other dependencies with pip - run: | - printenv - pip install lmfit peakutils pyepics pyshortcuts termcolor sphinx dill xraydb wxmplot wxutils fabio silx imageio charset-normalizer - pip install . - - name: Run test suite - run: | - cd tests - python -m pytest diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index efe8e9705..53b08aa38 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -16,7 +16,6 @@ jobs: uses: conda-incubator/setup-miniconda@v2.2.0 with: miniconda-version: latest - mamba-version: "*" channels: conda-forge,defaults channel-priority: true activate-environment: anaconda-client-env