From 82b4f30b941fba7f49dedc539f81012d4030432e Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 30 Sep 2024 16:04:36 -0400 Subject: [PATCH 1/3] Remove conda-recipe in repo --- conda-recipe/bld.bat | 7 ---- conda-recipe/build.sh | 25 ------------ conda-recipe/conda_build_config.yaml | 11 ----- conda-recipe/meta.txt | 60 ---------------------------- 4 files changed, 103 deletions(-) delete mode 100644 conda-recipe/bld.bat delete mode 100644 conda-recipe/build.sh delete mode 100644 conda-recipe/conda_build_config.yaml delete mode 100644 conda-recipe/meta.txt diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat deleted file mode 100644 index 3038f794..00000000 --- a/conda-recipe/bld.bat +++ /dev/null @@ -1,7 +0,0 @@ -%PYTHON% -m easy_install --no-deps . -if errorlevel 1 exit 1 - -:: Add more build steps here, if they are necessary. - -:: See http://docs.continuum.io/conda/build.html -:: for a list of environment variables that are set during the build process. diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh deleted file mode 100644 index 70ddaf82..00000000 --- a/conda-recipe/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Produce stripped binaries on Linux. -if [[ "$(uname)" == Linux ]]; then - # conda-build does not set LDFLAGS on Linux. - export LDFLAGS="-s" -fi - -# allow use of default SDK on travis -if [[ "$(id -un)" == travis ]]; then - unset CONDA_BUILD_SYSROOT -# print informative message if SDK is not installed -elif [[ "$(uname)" == Darwin ]]; then - if [[ ! -e $CONDA_BUILD_SYSROOT ]]; then - echo "Please install macOS SDK to $CONDA_BUILD_SYSROOT" - exit 2 - fi -fi - -$PYTHON -m easy_install --no-deps . - -# Add more build steps here, if they are necessary. - -# See http://docs.continuum.io/conda/build.html -# for a list of environment variables that are set during the build process. diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml deleted file mode 100644 index 4244b05c..00000000 --- a/conda-recipe/conda_build_config.yaml +++ /dev/null @@ -1,11 +0,0 @@ -python: - - 3.12 - - 3.11 - - 3.10 - - 3.9 - - 3.8 - - 3.7 - - 2.7 - -gsl: - - 2.4 diff --git a/conda-recipe/meta.txt b/conda-recipe/meta.txt deleted file mode 100644 index 9296ff4e..00000000 --- a/conda-recipe/meta.txt +++ /dev/null @@ -1,60 +0,0 @@ -{% set setupdata = load_setup_py_data() %} - -package: - name: diffpy.pdffit2 - version: {{ setupdata['version'] }} - -source: - # git_url: https://github.com/diffpy/diffpy.pdffit2.git - git_url: .. - -build: - preserve_egg_dir: True - - # If this is a new build for the same version, increment the build - # number. If you do not include this key, it defaults to 0. - number: 0 - -requirements: - build: - - {{ compiler('cxx') }} # [py3k or not win] - - gsl {{ gsl }} - host: - - python {{ python }} - - pip - - setuptools - - run: - - python - - setuptools - - six - - diffpy.structure >=3 - -test: - # Python imports - imports: - - diffpy - - diffpy.pdffit2 - - diffpy.pdffit2.ipy_ext - - diffpy.pdffit2.tests - - # commands: - # You can put test commands to be run here. Use this to test that the - # entry points work. - - - # You can also put a file called run_test.py in the recipe that will be run - # at test time. - - # requires: - # Put any additional test requirements here. For example - # - nose - -about: - home: https://github.com/diffpy/diffpy.pdffit2 - summary: PDFfit2 - real space structure refinement program - license: Modified BSD License - license_file: LICENSE.txt - -# See http://docs.continuum.io/conda/build.html -# for more information about meta.yaml. From e02598fb340d4cd539efb9a75df2771acc1fa71f Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 30 Sep 2024 16:20:44 -0400 Subject: [PATCH 2/3] Create rm-recipe --- news/rm-recipe | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/rm-recipe diff --git a/news/rm-recipe b/news/rm-recipe new file mode 100644 index 00000000..3af76e88 --- /dev/null +++ b/news/rm-recipe @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* remove older conda-recipe files + +**Security:** + +* From 2605e9af99cc548f3321557cdb6b6ba07c618e26 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 30 Sep 2024 16:21:35 -0400 Subject: [PATCH 3/3] Rename rm-recipe to rm-recipe.rst --- news/{rm-recipe => rm-recipe.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{rm-recipe => rm-recipe.rst} (100%) diff --git a/news/rm-recipe b/news/rm-recipe.rst similarity index 100% rename from news/rm-recipe rename to news/rm-recipe.rst