From f3716e901675ae84e2a39bdbd4e053126a923949 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 14 Jul 2023 15:26:28 -0400 Subject: [PATCH 1/2] MNT: Re-rendered with conda-build 3.22.0 and conda-smithy 3.24.0 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .ci_support/linux_64_.yaml | 4 +++- .circleci/config.yml | 2 +- .github/workflows/automerge.yml | 4 ++-- .github/workflows/webservices.yml | 2 +- README.md | 16 ++++++++-------- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 80ab7e0..8f69b57 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,7 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 8af580e..5124705 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -13,9 +13,11 @@ cxx_compiler: cxx_compiler_version: - '7' docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 +- quay.io/condaforge/linux-anvil-cos7-x86_64 fftw: - '3' +hdf5: +- 1.10.6 jpeg: - '9' libpng: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f79fe85..da1368a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,10 +10,10 @@ jobs: name: automerge steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71..d6f06b5 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/README.md b/README.md index ab92b3e..63f2f0c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About lammps-library -==================== +About lammps-library-feedstock +============================== + +Feedstock license: [BSD-3-Clause](https://github.com/deepmd-kit-recipes/lammps-dp-feedstock/blob/main/LICENSE.txt) Home: http://lammps.sandia.gov Package license: GPL-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/deepmd-kit-recipes/lammps-dp-feedstock/blob/master/LICENSE.txt) - Summary: LAMMPS stands for Large-scale Atomic/Molecular Massively Parallel Simulator. Development: https://github.com/lammps/lammps @@ -31,8 +31,8 @@ Current build status
- - + + @@ -40,8 +40,8 @@ Current build status From 9431b065743faa24c566e2bcb26b3b5442739918 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 14 Jul 2023 15:27:44 -0400 Subject: [PATCH 2/2] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 310241c..09157ee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: #sha256: 5380c1689a93d7922e3d65d9c186401d429878bb3cbe9a692580d3470d6a253f build: - number: 0 + number: 1 skip: True # [not linux] skip: True # [ppc64le]
linux_64 - - variant + + variant