From b029295dc340cef7447794a967441a89b4faf8cc Mon Sep 17 00:00:00 2001 From: Mikael Mortensen Date: Wed, 22 May 2024 11:43:55 +0200 Subject: [PATCH] Removing stuff from old conda build --- Makefile | 9 +------ README.rst | 7 ------ conf/build.sh | 9 ------- conf/conda_build_config.yaml | 5 ---- conf/meta.yaml | 46 ------------------------------------ conf/run_test.sh | 4 ---- docs/source/installation.rst | 9 ------- 7 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 conf/build.sh delete mode 100644 conf/conda_build_config.yaml delete mode 100644 conf/meta.yaml delete mode 100644 conf/run_test.sh diff --git a/Makefile b/Makefile index ac24366..eb03787 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,12 @@ -VERSION=$(shell python3 -c "import mpi4py_fft; print(mpi4py_fft.__version__)") +VERSION=$(shell python -c "import mpi4py_fft; print(mpi4py_fft.__version__)") default: python setup.py build build_ext -i -pip: - rm -f dist/* - python setup.py sdist - twine upload dist/* - tag: git tag $(VERSION) git push --tags -publish: tag pip - clean: git clean -dxf mpi4py_fft cd docs && make clean && cd .. diff --git a/README.rst b/README.rst index b941f22..6e44162 100644 --- a/README.rst +++ b/README.rst @@ -47,13 +47,6 @@ Install with conda from the coda-forge channel:: conda install -c conda-forge mpi4py-fft -or build it with conda build from the main source directory:: - - conda build -c conda-forge conf/ - conda create --name mpi4py_fft mpi4py_fft --use-local - -which will pull in the required dependencies from the conda-forge channel. - Note that mpi4py-fft depends on Python packages * mpi4py diff --git a/conf/build.sh b/conf/build.sh deleted file mode 100644 index f97bd76..0000000 --- a/conf/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ "$(uname)" == "Darwin" ] -then - export LDFLAGS="-Wl,-rpath,$PREFIX/lib" - export MACOSX_DEPLOYMENT_TARGET=10.9 -fi - -$PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv diff --git a/conf/conda_build_config.yaml b/conf/conda_build_config.yaml deleted file mode 100644 index 81b548d..0000000 --- a/conf/conda_build_config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -#mpi: -# - 'openmpi' -# - 'mpich' -numpy: - - '1.21' diff --git a/conf/meta.yaml b/conf/meta.yaml deleted file mode 100644 index 84d4a10..0000000 --- a/conf/meta.yaml +++ /dev/null @@ -1,46 +0,0 @@ -{% set data = load_setup_py_data() %} - -package: - name: mpi4py_fft_test - version: {{ data.get('version') }} - -source: - git_url: ../ - -build: - number: 2002 - -requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - host: - - python - - cython - - numpy - - pip - - fftw - - setuptools - - run: - - python - - mpi4py - - mpich - - {{ pin_compatible('numpy') }} - - fftw - - hdf5 * mpi_* - - h5py * mpi_* - - netcdf4 * mpi_* - -test: - requires: - - coverage - - codecov - - scipy - - pyfftw 0.12 - - source_files: - - tests - - imports: - - mpi4py_fft diff --git a/conf/run_test.sh b/conf/run_test.sh deleted file mode 100644 index 0748882..0000000 --- a/conf/run_test.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!bin/bash - -pushd tests -./runtests.sh diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 3af4eef..f224d3a 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -58,14 +58,6 @@ after cloning or forking pip install . -or using `conda-build`_ with the recipes in folder ``conf/`` - -:: - - conda build -c conda-forge conf/ - conda create --name mpi4py-fft -c conda-forge mpi4py-fft --use-local - conda activate mpi4py-fft - Additional dependencies ----------------------- @@ -115,5 +107,4 @@ This test-suit is run automatically on every commit to github, see, e.g., .. _openmpi: https://www.open-mpi.org .. _numpy: https://www.numpy.org .. _numba: https://www.numba.org -.. _conda-build: https://conda.io/docs/commands/build/conda-build.html .. _pypi: https://pypi.org/project/shenfun/