Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LBNL-ETA/pyWinCalc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: LBNL-ETA/pyWinCalc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: build_changes_oct_2024
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Oct 29, 2024

  1. Copy the full SHA
    1609ded View commit details

Commits on Oct 30, 2024

  1. Copy the full SHA
    54842cb View commit details
  2. Copy the full SHA
    f9cdfc2 View commit details
  3. github actions: reverting to previous working config for manylinux bu…

    …ilds and adding created wheels to same artifact archive as the other wheels.
    StephenCzarnecki committed Oct 30, 2024
    Copy the full SHA
    6af717b View commit details
  4. Copy the full SHA
    503097c View commit details
  5. Copy the full SHA
    58d460a View commit details
  6. Copy the full SHA
    58e1fe9 View commit details
  7. Copy the full SHA
    a6fb554 View commit details
  8. Copy the full SHA
    a329771 View commit details
  9. Copy the full SHA
    5357bd4 View commit details
  10. Copy the full SHA
    1ffc6e0 View commit details
  11. Copy the full SHA
    ede7573 View commit details
  12. Copy the full SHA
    ed1aaac View commit details
  13. Copy the full SHA
    d22ad88 View commit details
  14. Copy the full SHA
    745da7e View commit details
  15. Copy the full SHA
    90dc570 View commit details

Commits on Oct 31, 2024

  1. github actions: splitting linux arm64 wheels into seperate jobs for e…

    …ach python version in order to stay below the github actions timeout of 6 hours per job.
    StephenCzarnecki committed Oct 31, 2024
    Copy the full SHA
    99cd20d View commit details
  2. Copy the full SHA
    161d9bf View commit details
  3. Copy the full SHA
    d923c5f View commit details
  4. Copy the full SHA
    8dc8b0f View commit details
  5. Copy the full SHA
    6b6b58a View commit details
Showing with 36 additions and 24 deletions.
  1. +34 −22 .github/workflows/build_wheels.yml
  2. +1 −1 CMakeLists-WinCalc.txt.in
  3. +1 −1 setup.cfg
56 changes: 34 additions & 22 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
@@ -91,24 +91,31 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Need to use the image specified below to build manylinux wheels
# PyPi only accepts manylinux wheels, it does not accept wheels for specific versions/architectures
# Note that at least manylinux2014 is needed to get support for C++17
- name: Build manylinux Python wheels
uses: RalfG/python-wheels-manylinux-build@v0.7.1-manylinux2014_x86_64
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312'
build-requirements: 'setuptools'


- name: Install cibuildwheel
run: |
python -m pip install --upgrade pip
pip install cibuildwheel
- name: Build wheels with cibuildwheel
env:
CIBW_PLATFORM: "linux"
CIBW_SKIP: "cp36-* cp37-*"
CIBW_ARCHS_LINUX: "x86_64"
run: |
cibuildwheel --output-dir wheelhouse
- name: upload wheels
uses: actions/upload-artifact@v3
with:
path: ./dist/*-manylinux*.whl
path: wheelhouse/*.whl

build_wheels_manylinux_arm64:
name: Build manylinux wheels (arm64)
name: Build manylinux wheels ${{ matrix.python-version }} (arm64)
runs-on: ubuntu-24.04
strategy:
matrix:
python-version: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -119,15 +126,20 @@ jobs:
with:
platforms: arm64

# Build manylinux Python wheels for arm64 architecture
- name: Build manylinux Python wheels (arm64)
uses: RalfG/python-wheels-manylinux-build@v0.7.1-manylinux2014_aarch64
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312'
build-requirements: 'setuptools'

- name: Upload arm64 wheels
- name: Install cibuildwheel
run: |
python -m pip install --upgrade pip
pip install cibuildwheel
- name: Build wheels with cibuildwheel
env:
CIBW_PLATFORM: "linux"
CIBW_BUILD: ${{ matrix.python-version }}
CIBW_ARCHS_LINUX: "aarch64"
run: |
cibuildwheel --output-dir wheelhouse
- name: upload wheels
uses: actions/upload-artifact@v3
with:
path: ./dist/*-manylinux*.whl
name: wheels-arm64
path: wheelhouse/*.whl
2 changes: 1 addition & 1 deletion CMakeLists-WinCalc.txt.in
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ include(ExternalProject)

ExternalProject_Add(wincalc
GIT_REPOSITORY https://github.com/LBNL-ETA/WinCalc.git
GIT_TAG "v2.5.1"
GIT_TAG "github_actions_oct_2024"

UPDATE_COMMAND ""
PATCH_COMMAND ""
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = pywincalc
version = 3.6.8
version = 3.6.9
description = A Python library for calculating thermal and optical properties of glazing systems
long_description = file: README.md
long_description_content_type = text/markdown; charset=UTF-8