From f818fc659a5b4d544662de166cc5ad07d7c6546c Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 6 Jan 2023 16:37:50 +1100 Subject: [PATCH] Bundle ifcopenshell for Python 3.11 on PyPI. See #2551. --- .github/workflows/ci-ifcopenshell-pypi.yml | 2 +- src/ifcopenshell-python/Makefile | 12 +++++- .../docs/ifcopenshell-python/installation.rst | 42 +++++++++++-------- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci-ifcopenshell-pypi.yml b/.github/workflows/ci-ifcopenshell-pypi.yml index 6770505dad..0ad9c0adae 100644 --- a/.github/workflows/ci-ifcopenshell-pypi.yml +++ b/.github/workflows/ci-ifcopenshell-pypi.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - pyver: [py36, py37, py38, py39, py310] + pyver: [py36, py37, py38, py39, py310, py311] config: - { name: "Windows Build", diff --git a/src/ifcopenshell-python/Makefile b/src/ifcopenshell-python/Makefile index ccf7cbe2be..10a2f2ecc5 100644 --- a/src/ifcopenshell-python/Makefile +++ b/src/ifcopenshell-python/Makefile @@ -15,7 +15,10 @@ ifeq ($(PYVERSION), py39) PYNUMBER:=39 endif ifeq ($(PYVERSION), py310) -PYNUMBER:=31 +PYNUMBER:=310 +endif +ifeq ($(PYVERSION), py311) +PYNUMBER:=311 endif ifeq ($(PLATFORM), linux) @@ -38,6 +41,13 @@ PYNUMBER:=37 endif endif +ifeq ($(PLATFORM), macos) +ifeq ($(PYVERSION), py311) +# Pure Evil. Let me know if you're the first to file a bug report. +PYNUMBER:=310 +endif +endif + .PHONY: test test: pytest -p no:pytest-blender test diff --git a/src/ifcopenshell-python/docs/ifcopenshell-python/installation.rst b/src/ifcopenshell-python/docs/ifcopenshell-python/installation.rst index adf64e69a7..a51671cfd7 100644 --- a/src/ifcopenshell-python/docs/ifcopenshell-python/installation.rst +++ b/src/ifcopenshell-python/docs/ifcopenshell-python/installation.rst @@ -16,44 +16,50 @@ Pre-built packages 1. Choose which version to download based on your operating system, Python version, and computer architecture. - +-------------+----------------+----------------+----------------+----------------+-----------------+ - | | Linux 64bit | Windows 32bit | Windows 64bit | MacOS 64bit | MacOS M1 64bit | - +=============+================+================+================+================+=================+ - | Python 3.6 | py36-linux64_ | py36-win32_ | py36-win64_ | py36-macos64_ | N/A | - +-------------+----------------+----------------+----------------+----------------+-----------------+ - | Python 3.7 | py37-linux64_ | py37-win32_ | py37-win64_ | py37-macos64_ | py37-macosm164_ | - +-------------+----------------+----------------+----------------+----------------+-----------------+ - | Python 3.8 | py38-linux64_ | py38-win32_ | py38-win64_ | py38-macos64_ | py38-macosm164_ | - +-------------+----------------+----------------+----------------+----------------+-----------------+ - | Python 3.9 | py39-linux64_ | py39-win32_ | py39-win64_ | py39-macos64_ | py39-macosm164_ | - +-------------+----------------+----------------+----------------+----------------+-----------------+ - | Python 3.10 | py31-linux64_ | py31-win32_ | py31-win64_ | py31-macos64_ | py31-macosm164_ | - +-------------+----------------+----------------+----------------+----------------+-----------------+ + +-------------+----------------+----------------+----------------+----------------+------------------+ + | | Linux 64bit | Windows 32bit | Windows 64bit | MacOS 64bit | MacOS M1 64bit | + +=============+================+================+================+================+==================+ + | Python 3.6 | py36-linux64_ | py36-win32_ | py36-win64_ | py36-macos64_ | N/A | + +-------------+----------------+----------------+----------------+----------------+------------------+ + | Python 3.7 | py37-linux64_ | py37-win32_ | py37-win64_ | py37-macos64_ | py37-macosm164_ | + +-------------+----------------+----------------+----------------+----------------+------------------+ + | Python 3.8 | py38-linux64_ | py38-win32_ | py38-win64_ | py38-macos64_ | py38-macosm164_ | + +-------------+----------------+----------------+----------------+----------------+------------------+ + | Python 3.9 | py39-linux64_ | py39-win32_ | py39-win64_ | py39-macos64_ | py39-macosm164_ | + +-------------+----------------+----------------+----------------+----------------+------------------+ + | Python 3.10 | py310-linux64_ | py310-win32_ | py310-win64_ | py310-macos64_ | py310-macosm164_ | + +-------------+----------------+----------------+----------------+----------------+------------------+ + | Python 3.11 | py311-linux64_ | py311-win32_ | py311-win64_ | N/A | py311-macosm164_ | + +-------------+----------------+----------------+----------------+----------------+------------------+ .. _py36-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-36-v0.7.0-6180d73-linux64.zip .. _py37-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-37-v0.7.0-6180d73-linux64.zip .. _py38-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-38-v0.7.0-6180d73-linux64.zip .. _py39-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-39-v0.7.0-6180d73-linux64.zip -.. _py31-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-31-v0.7.0-6180d73-linux64.zip +.. _py310-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-310-v0.7.0-6180d73-linux64.zip +.. _py311-linux64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.7.0-6180d73-linux64.zip .. _py36-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-36-v0.7.0-6180d73-win64.zip .. _py37-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-37-v0.7.0-6180d73-win64.zip .. _py38-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-38-v0.7.0-6180d73-win64.zip .. _py39-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-39-v0.7.0-6180d73-win64.zip -.. _py31-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-31-v0.7.0-6180d73-win64.zip +.. _py310-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-310-v0.7.0-6180d73-win64.zip +.. _py311-win32: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.7.0-6180d73-win64.zip .. _py36-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-36-v0.7.0-6180d73-win64.zip .. _py37-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-37-v0.7.0-6180d73-win64.zip .. _py38-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-38-v0.7.0-6180d73-win64.zip .. _py39-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-39-v0.7.0-6180d73-win64.zip -.. _py31-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-31-v0.7.0-6180d73-win64.zip +.. _py310-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-310-v0.7.0-6180d73-win64.zip +.. _py311-win64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.7.0-6180d73-win64.zip .. _py36-macos64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-36-v0.7.0-6180d73-macos64.zip .. _py37-macos64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-37-v0.7.0-6180d73-macos64.zip .. _py38-macos64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-38-v0.7.0-6180d73-macos64.zip .. _py39-macos64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-39-v0.7.0-6180d73-macos64.zip -.. _py31-macos64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-31-v0.7.0-6180d73-macos64.zip +.. _py310-macos64: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-310-v0.7.0-6180d73-macos64.zip .. _py37-macosm164: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-37-v0.7.0-6180d73-macosm164.zip .. _py38-macosm164: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-38-v0.7.0-6180d73-macosm164.zip .. _py39-macosm164: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-39-v0.7.0-6180d73-macosm164.zip -.. _py31-macosm164: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-31-v0.7.0-6180d73-macosm164.zip +.. _py310-macosm164: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-310-v0.7.0-6180d73-macosm164.zip +.. _py311-macosm164: https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-311-v0.7.0-6180d73-macosm164.zip 2. Unzip the downloaded file and copy the ``ifcopenshell`` directory into your Python path. If you're not sure where your Python path is, run the following