diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 7662542c..2b1cd374 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -41,7 +41,7 @@ jobs: run: conda install conda-build - name: Build conda package run: | - CHANNELS="-c conda-forge -c intel --override-channels" + CHANNELS="-c conda-forge -c https://software.repos.intel.com/python/conda --override-channels" VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" @@ -67,7 +67,7 @@ jobs: runner: [ubuntu-latest] continue-on-error: ${{ matrix.experimental }} env: - CHANNELS: -c intel -c main --override-channels + CHANNELS: -c https://software.repos.intel.com/python/conda -c main --override-channels steps: - name: Download artifact @@ -150,7 +150,7 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - name: Build conda package - run: conda build --no-test --python ${{ matrix.python }} -c intel -c conda-forge --override-channels conda-recipe + run: conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels conda-recipe - name: Upload artifact uses: actions/upload-artifact@v4 with: @@ -171,7 +171,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} env: workdir: '${{ github.workspace }}' - CHANNELS: -c intel -c conda-forge --override-channels + CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels steps: - name: Download artifact diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fb393f18..00000000 --- a/.travis.yml +++ /dev/null @@ -1,31 +0,0 @@ -matrix: - include: - - name: "Linux-Py3" - os: linux - env: - - MINICONDA=Miniconda3-latest-Linux-x86_64.sh - - PYVER="" - - name: "OsX-Py3" - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="brew install gcc && CC=gcc-7 && CXX=g++-7" - - MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh - - MACOSX_DEPLOYMENT_TARGET="10.9" - - PYVER="" - -install: - - wget https://repo.continuum.io/miniconda/$MINICONDA -O miniconda.sh; - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - - conda install -c conda-forge conda-forge::conda-build - # Useful for debugging any issues with conda - - conda info -a - - gcc -v - - g++ -v - -script: - - conda build -c intel -c conda-forge --override-channels $PYVER conda-recipe diff --git a/README.md b/README.md index 854769ab..b9b1907a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,13 @@ as a stand-alone package. It can be installed into conda environment using ``` - conda install -c intel mkl_fft + conda install -c https://software.repos.intel.com/python/conda mkl_fft +``` + +or from conda-forge channel: + +``` + conda install -c conda-forge mkl_fft ``` ---