From 6474552649d605bec6e2b94fbfeb639bad966fe5 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Wed, 12 Jun 2024 18:25:05 +1000 Subject: [PATCH] IfcClash workflow now uses VERSION --- .github/workflows/ci-ifcclash-pypi.yaml | 13 ------------- src/ifcclash/Makefile | 10 +++++++--- src/ifcclash/ifcclash/__init__.py | 19 +++++++++++++++++++ src/ifcclash/pyproject.toml | 2 +- 4 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 src/ifcclash/ifcclash/__init__.py diff --git a/.github/workflows/ci-ifcclash-pypi.yaml b/.github/workflows/ci-ifcclash-pypi.yaml index 9aa0349d0b..bd2875e138 100644 --- a/.github/workflows/ci-ifcclash-pypi.yaml +++ b/.github/workflows/ci-ifcclash-pypi.yaml @@ -1,21 +1,8 @@ name: ci-ifcclash-pypi on: - schedule: - # ┌───────────── minute (0 - 59) - # │ ┌───────────── hour (0 - 23) - # │ │ ┌───────────── day of the month (1 - 31) - # │ │ │ ┌───────────── month (1 - 12 or JAN-DEC) - # │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT) - # * * * * * - - cron: "0 0 18 * *" workflow_dispatch: -env: - major: 0 - minor: 0 - name: ifcopenshell - jobs: activate: runs-on: ubuntu-latest diff --git a/src/ifcclash/Makefile b/src/ifcclash/Makefile index ec05e23471..5c577b742f 100644 --- a/src/ifcclash/Makefile +++ b/src/ifcclash/Makefile @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with IfcClash. If not, see . -VERSION:=`date '+%y%m%d'` +VERSION:=$(shell cat ../../VERSION) SED:=sed -i ifeq ($(UNAME_S),Darwin) SED:=sed -i '' -e @@ -29,6 +29,10 @@ qa: .PHONY: dist dist: rm -rf dist - $(SED) "s/999999/$(VERSION)/" pyproject.toml + cp pyproject.toml pyproject.toml.bak + cp ifcclash/__init__.py __init__.py.bak + $(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' pyproject.toml + $(SED) 's/version = "0.0.0"/version = "$(VERSION)"/' ifcclash/__init__.py python -m build - $(SED) "s/$(VERSION)/999999/" pyproject.toml + mv pyproject.toml.bak pyproject.toml + mv __init__.py.bak ifcclash/__init__.py diff --git a/src/ifcclash/ifcclash/__init__.py b/src/ifcclash/ifcclash/__init__.py new file mode 100644 index 0000000000..76e57f82de --- /dev/null +++ b/src/ifcclash/ifcclash/__init__.py @@ -0,0 +1,19 @@ +# IfcClash - IFC-based clash detection. +# Copyright (C) 2020-2024 Dion Moult +# +# This file is part of IfcClash. +# +# IfcClash is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# IfcClash is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with IfcClash. If not, see . + +__version__ = version = "0.0.0" diff --git a/src/ifcclash/pyproject.toml b/src/ifcclash/pyproject.toml index 148c16a0e4..dc27c49efc 100644 --- a/src/ifcclash/pyproject.toml +++ b/src/ifcclash/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "ifcclash" -version = "0.0.999999" +version = "0.0.0" authors = [ { name="Dion Moult", email="dion@thinkmoult.com" }, ]