From b1256c0a22b89b5b37a6e020f16681a1d05315b0 Mon Sep 17 00:00:00 2001 From: Gyeongjae Choi Date: Tue, 19 Sep 2023 20:33:58 +0900 Subject: [PATCH] Rename setup.py in coolprop (#4145) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .prettierignore | 2 +- packages/coolprop/{ => extras}/pyproject.toml | 0 packages/coolprop/{ => extras}/setup.py | 0 packages/coolprop/meta.yaml | 4 ++-- packages/libf2c/{ => extras}/make.inc | 0 packages/libf2c/meta.yaml | 2 +- .../matplotlib/{src => extras}/Humor-Sans-1.0.ttf | Bin packages/matplotlib/{src => extras}/fontlist.json | 0 packages/matplotlib/{src => extras}/setup.cfg | 0 packages/matplotlib/meta.yaml | 6 +++--- packages/nlopt/{src => extras}/setup.py | 0 packages/nlopt/meta.yaml | 2 +- .../{cmake => extras}/OpenCVFindLibsGrfmt.cmake | 0 .../opencv-python/{cmake => extras}/build_args.sh | 0 .../{cmake => extras}/detect_ffmpeg.cmake | 0 packages/opencv-python/meta.yaml | 6 +++--- pyproject.toml | 2 +- 17 files changed, 12 insertions(+), 12 deletions(-) rename packages/coolprop/{ => extras}/pyproject.toml (100%) rename packages/coolprop/{ => extras}/setup.py (100%) rename packages/libf2c/{ => extras}/make.inc (100%) rename packages/matplotlib/{src => extras}/Humor-Sans-1.0.ttf (100%) rename packages/matplotlib/{src => extras}/fontlist.json (100%) rename packages/matplotlib/{src => extras}/setup.cfg (100%) rename packages/nlopt/{src => extras}/setup.py (100%) rename packages/opencv-python/{cmake => extras}/OpenCVFindLibsGrfmt.cmake (100%) rename packages/opencv-python/{cmake => extras}/build_args.sh (100%) rename packages/opencv-python/{cmake => extras}/detect_ffmpeg.cmake (100%) diff --git a/.prettierignore b/.prettierignore index 81f290b4a..b125d1594 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,5 +9,5 @@ cpython .vscode .pytest_cache .clang-format -packages/libf2c/make.inc +packages/libf2c/extras/make.inc src/js/generated_struct_info32.json diff --git a/packages/coolprop/pyproject.toml b/packages/coolprop/extras/pyproject.toml similarity index 100% rename from packages/coolprop/pyproject.toml rename to packages/coolprop/extras/pyproject.toml diff --git a/packages/coolprop/setup.py b/packages/coolprop/extras/setup.py similarity index 100% rename from packages/coolprop/setup.py rename to packages/coolprop/extras/setup.py diff --git a/packages/coolprop/meta.yaml b/packages/coolprop/meta.yaml index 5eaabeb93..b00141c74 100644 --- a/packages/coolprop/meta.yaml +++ b/packages/coolprop/meta.yaml @@ -10,9 +10,9 @@ source: extract_dir: source extras: - - - setup.py + - - extras/setup.py - ./setup.py - - - pyproject.toml + - - extras/pyproject.toml - ./pyproject.toml requirements: diff --git a/packages/libf2c/make.inc b/packages/libf2c/extras/make.inc similarity index 100% rename from packages/libf2c/make.inc rename to packages/libf2c/extras/make.inc diff --git a/packages/libf2c/meta.yaml b/packages/libf2c/meta.yaml index 893687b7c..29b243077 100644 --- a/packages/libf2c/meta.yaml +++ b/packages/libf2c/meta.yaml @@ -24,7 +24,7 @@ source: - patches/0006-adjust-ld-ar-ranlib.patch extras: - - [make.inc, make.inc] + - [extras/make.inc, make.inc] build: type: static_library diff --git a/packages/matplotlib/src/Humor-Sans-1.0.ttf b/packages/matplotlib/extras/Humor-Sans-1.0.ttf similarity index 100% rename from packages/matplotlib/src/Humor-Sans-1.0.ttf rename to packages/matplotlib/extras/Humor-Sans-1.0.ttf diff --git a/packages/matplotlib/src/fontlist.json b/packages/matplotlib/extras/fontlist.json similarity index 100% rename from packages/matplotlib/src/fontlist.json rename to packages/matplotlib/extras/fontlist.json diff --git a/packages/matplotlib/src/setup.cfg b/packages/matplotlib/extras/setup.cfg similarity index 100% rename from packages/matplotlib/src/setup.cfg rename to packages/matplotlib/extras/setup.cfg diff --git a/packages/matplotlib/meta.yaml b/packages/matplotlib/meta.yaml index adc8217b6..b50eb446a 100644 --- a/packages/matplotlib/meta.yaml +++ b/packages/matplotlib/meta.yaml @@ -17,7 +17,7 @@ source: - patches/fix-threading.patch extras: - - - src/setup.cfg + - - extras/setup.cfg - ./mplsetup.cfg build: @@ -36,8 +36,8 @@ build: rm -rf matplotlib/backends/qt_editor rm -rf matplotlib/backends/web_backend rm -rf sphinxext - cp $PKGDIR/src/fontlist.json matplotlib - cp $PKGDIR/src/Humor-Sans-1.0.ttf matplotlib/mpl-data/fonts/ttf/Humor-Sans.ttf + cp $PKGDIR/extras/fontlist.json matplotlib + cp $PKGDIR/extras/Humor-Sans-1.0.ttf matplotlib/mpl-data/fonts/ttf/Humor-Sans.ttf mkdir -p $PKGDIR/../../dist/fonts cp matplotlib/mpl-data/fonts/ttf/* $PKGDIR/../../dist/fonts/ diff --git a/packages/nlopt/src/setup.py b/packages/nlopt/extras/setup.py similarity index 100% rename from packages/nlopt/src/setup.py rename to packages/nlopt/extras/setup.py diff --git a/packages/nlopt/meta.yaml b/packages/nlopt/meta.yaml index e458d3b70..bf17fa829 100644 --- a/packages/nlopt/meta.yaml +++ b/packages/nlopt/meta.yaml @@ -9,7 +9,7 @@ source: sha256: b881cc2a5face5139f1c5a30caf26b7d3cb43d69d5e423c9d78392f99844499f extras: - - - src/setup.py + - - extras/setup.py - ./setup.py requirements: diff --git a/packages/opencv-python/cmake/OpenCVFindLibsGrfmt.cmake b/packages/opencv-python/extras/OpenCVFindLibsGrfmt.cmake similarity index 100% rename from packages/opencv-python/cmake/OpenCVFindLibsGrfmt.cmake rename to packages/opencv-python/extras/OpenCVFindLibsGrfmt.cmake diff --git a/packages/opencv-python/cmake/build_args.sh b/packages/opencv-python/extras/build_args.sh similarity index 100% rename from packages/opencv-python/cmake/build_args.sh rename to packages/opencv-python/extras/build_args.sh diff --git a/packages/opencv-python/cmake/detect_ffmpeg.cmake b/packages/opencv-python/extras/detect_ffmpeg.cmake similarity index 100% rename from packages/opencv-python/cmake/detect_ffmpeg.cmake rename to packages/opencv-python/extras/detect_ffmpeg.cmake diff --git a/packages/opencv-python/meta.yaml b/packages/opencv-python/meta.yaml index febbbf0a9..e4ed4958c 100644 --- a/packages/opencv-python/meta.yaml +++ b/packages/opencv-python/meta.yaml @@ -12,9 +12,9 @@ source: url: https://files.pythonhosted.org/packages/32/72/03747a6820bc970aeb0b89e653d1084068ac1ed606a83d8b5ac6fc237c14/opencv-python-4.8.0.76.tar.gz sha256: 56d84c43ce800938b9b1ec74b33942b2edbcef3f70c2754eb9bfe5dff1ee3ace extras: - - [cmake/OpenCVFindLibsGrfmt.cmake, opencv/cmake/OpenCVFindLibsGrfmt.cmake] + - [extras/OpenCVFindLibsGrfmt.cmake, opencv/cmake/OpenCVFindLibsGrfmt.cmake] - [ - cmake/detect_ffmpeg.cmake, + extras/detect_ffmpeg.cmake, opencv/modules/videoio/cmake/detect_ffmpeg.cmake, ] patches: @@ -52,4 +52,4 @@ build: export NUMPY_INCLUDE_DIR="$HOSTINSTALLDIR/lib/python$PYMAJOR.$PYMINOR/site-packages/numpy/core/include/" export FFMPEG_ROOT="$WASM_LIBRARY_DIR" - source $PKGDIR/cmake/build_args.sh + source $PKGDIR/extras/build_args.sh diff --git a/pyproject.toml b/pyproject.toml index 3b99051c8..54ee1c267 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -108,8 +108,8 @@ norecursedirs = [ ] addopts = ''' --doctest-modules ---ignore="packages/matplotlib/src" --ignore-glob="**/dist/" +--ignore-glob="packages/**/extras/" --tb=short --dist-dir=dist''' testpaths = [