From 9c066f394beea23228d8917d2d3e4406916701c5 Mon Sep 17 00:00:00 2001 From: Vincent Favre-Nicolin Date: Sun, 16 Oct 2022 16:41:42 +0200 Subject: [PATCH 1/4] update libobjcryst version --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b3d3934..51d63b8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: - pip - setuptools - numpy - - libobjcryst 2021.1.2 + - libobjcryst 2022.1.2 - boost run: # NOTE libobjcryst is implicitly added by libobjcryst run_exports From ad9382233e1e3e12760ba8607a5bbb5db2e7e20c Mon Sep 17 00:00:00 2001 From: Vincent Favre-Nicolin Date: Sun, 16 Oct 2022 17:29:34 +0200 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.15.22.25.24 --- .azure-pipelines/azure-pipelines-win.yml | 91 +++++++++++++++++++ .ci_support/README | 12 +-- ...win_64_numpy1.20python3.7.____cpython.yaml | 23 +++++ ...win_64_numpy1.20python3.8.____cpython.yaml | 23 +++++ ...win_64_numpy1.20python3.9.____cpython.yaml | 23 +++++ ...in_64_numpy1.21python3.10.____cpython.yaml | 23 +++++ README.md | 30 +++++- azure-pipelines.yml | 1 + 8 files changed, 219 insertions(+), 7 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_numpy1.20python3.7.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.20python3.8.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.20python3.9.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.21python3.10.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..6d89915 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,91 @@ +# 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 -*- + +jobs: +- job: win + pool: + vmImage: windows-2019 + strategy: + matrix: + win_64_numpy1.20python3.7.____cpython: + CONFIG: win_64_numpy1.20python3.7.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.20python3.8.____cpython: + CONFIG: win_64_numpy1.20python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.20python3.9.____cpython: + CONFIG: win_64_numpy1.20python3.9.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.21python3.10.____cpython: + CONFIG: win_64_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + + steps: + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + + - script: | + call activate base + mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + - script: | + call activate base + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/README b/.ci_support/README index a47316b..69c5db6 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/win_64_numpy1.20python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.20python3.7.____cpython.yaml new file mode 100644 index 0000000..6b8ceeb --- /dev/null +++ b/.ci_support/win_64_numpy1.20python3.7.____cpython.yaml @@ -0,0 +1,23 @@ +boost: +- 1.78.0 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.20' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.7.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml new file mode 100644 index 0000000..19d9427 --- /dev/null +++ b/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml @@ -0,0 +1,23 @@ +boost: +- 1.78.0 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.20' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml new file mode 100644 index 0000000..be7fce4 --- /dev/null +++ b/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml @@ -0,0 +1,23 @@ +boost: +- 1.78.0 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.20' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 0000000..727b2d7 --- /dev/null +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,23 @@ +boost: +- 1.78.0 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.21' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index 211d7a5..84dfba7 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Summary: Python bindings to the ObjCryst++ crystallographic library. Development: https://github.com/diffpy/pyobjcryst -Documentation: http://diffpy.github.io/pyobjcryst +Documentation: https://pyobjcryst.readthedocs.io/ Current build status ==================== @@ -107,6 +107,34 @@ Current build status variant + + win_64_numpy1.20python3.7.____cpython + + + variant + + + + win_64_numpy1.20python3.8.____cpython + + + variant + + + + win_64_numpy1.20python3.9.____cpython + + + variant + + + + win_64_numpy1.21python3.10.____cpython + + + variant + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From a9741af3232af0ad6a2c3f36cd2045ddf4f1742a Mon Sep 17 00:00:00 2001 From: Vincent Favre-Nicolin Date: Sun, 16 Oct 2022 21:37:51 +0200 Subject: [PATCH 3/4] Update for 2.2.3 version and use vs2019 for windows build --- recipe/conda_build_config.yaml | 4 ++++ recipe/meta.yaml | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..59b3265 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,4 @@ +c_compiler: # [win] +- vs2019 # [win] +cxx_compiler: # [win] +- vs2019 # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 51d63b8..f8dff8e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "pyobjcryst" %} -{% set version = "2.2.2" %} -{% set sha256 = "f04bbd412ee0b9d3c8f2cccdfabe157ec703bc21f9fcb2b820caf3777d660ca8" %} +{% set version = "2.2.3" %} +{% set sha256 = "7c2694d55c2b7994243587ca95955935f0890d06b7d232133c68429bcd1bc208" %} package: name: {{ name|lower }} @@ -12,8 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 1 - skip: true # [win] + number: 0 script: {{ PYTHON }} -m pip install . --no-deps -vv requirements: @@ -47,7 +46,7 @@ about: license_family: BSD license_file: LICENSE.txt summary: Python bindings to the ObjCryst++ crystallographic library. - doc_url: http://diffpy.github.io/pyobjcryst + doc_url: https://pyobjcryst.readthedocs.io/ dev_url: https://github.com/diffpy/pyobjcryst extra: From 1a41030c17365a71ffc271313751430e98ca4599 Mon Sep 17 00:00:00 2001 From: Vincent Favre-Nicolin Date: Sun, 16 Oct 2022 22:15:45 +0200 Subject: [PATCH 4/4] Update SHA --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f8dff8e..0037385 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "pyobjcryst" %} {% set version = "2.2.3" %} -{% set sha256 = "7c2694d55c2b7994243587ca95955935f0890d06b7d232133c68429bcd1bc208" %} +{% set sha256 = "e156b47a0ba0dfc0bd9592a121b4849c2674da530705235c88e6cbc16e539c2e" %} package: name: {{ name|lower }}