Code

Enable Mac ARM support#3408

Code

Merged

reyery merged 18 commits intomasterarchitecture-building-systems/CityEnergyAnalyst:masterfrom revert-3406-revert-3265-mac-arm-native-supportarchitecture-building-systems/CityEnergyAnalyst:revert-3406-revert-3265-mac-arm-native-supportCopy head branch name to clipboardJan 16, 2024

+25,233-205

Commits

Commits on Oct 15, 2023

• Revert "Revert "Update pythonocc to enable Mac ARM support""

  reyery

  authored
  9b32316

  Copy full SHA for 9b32316

Commits on Oct 23, 2023

• Merge branch 'master' into revert-3406-revert-3265-mac-arm-native-support

  reyery

  authored
  51272b0

  Copy full SHA for 51272b0

• Pin geopandas

  reyery

  authored
  63c76de

  Copy full SHA for 63c76de

Commits on Jan 11, 2024

• Merge branch 'master' into revert-3406-revert-3265-mac-arm-native-support

  reyery

  authored
  2d3e390

  Copy full SHA for 2d3e390

Commits on Jan 15, 2024

• Add conda-lock action

  reyery

  committed
  3c0981e

  Copy full SHA for 3c0981e

• Merge branch 'master' into revert-3406-revert-3265-mac-arm-native-support

  reyery

  authored
  5ce1edc

  Copy full SHA for 5ce1edc

• Run conda-lock action on PR

  reyery

  committed
  23a7ecb

  Copy full SHA for 23a7ecb

• Merge branch 'revert-3406-revert-3265-mac-arm-native-support' of https://github.com/architecture-building-systems/CityEnergyAnalyst into revert-3406-revert-3265-mac-arm-native-support

  reyery

  committed
  3ff3b5b

  Copy full SHA for 3ff3b5b

• Add missing environment name

  reyery

  authored
  cf48453

  Copy full SHA for cf48453

• Remove numpy version pin

  reyery

  committed
  b03d8c4

  Copy full SHA for b03d8c4

• Merge branch 'revert-3406-revert-3265-mac-arm-native-support' of https://github.com/architecture-building-systems/CityEnergyAnalyst into revert-3406-revert-3265-mac-arm-native-support

  reyery

  committed
  748b031

  Copy full SHA for 748b031

• Fix numpy and numba version

  reyery

  committed
  2f09161

  Copy full SHA for 2f09161

• Replace np.float to float due to deprecation

  Show description for 7860c60
  reyery

  committed
  7860c60

  Copy full SHA for 7860c60

• Fix numpy version

  reyery

  committed
  bd47129

  Copy full SHA for bd47129

Commits on Jan 16, 2024

• Fix shapely version

  reyery

  committed
  349b0e4

  Copy full SHA for 349b0e4

• Remove mock from normal dependencies

  reyery

  committed
  8bac175

  Copy full SHA for 8bac175

• Reduce conda solver search space

  Show description for a316491
  reyery

  committed
  a316491

  Copy full SHA for a316491

• Create lockfile in temp directory

  reyery

  committed
  a9d3750

  Copy full SHA for a9d3750