From bfcc086aada6bd1f34057b67aaefa6496cfb7a52 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Mon, 3 Oct 2022 23:40:29 +1100
Subject: [PATCH] Attempt to change PyPI name to ifcopenshell

---
 .github/workflows/ci-ifcopenshell-pypi.yml | 6 +++---
 src/ifcopenshell-python/Makefile           | 6 +++---
 src/ifcopenshell-python/pyproject.toml     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-ifcopenshell-pypi.yml b/.github/workflows/ci-ifcopenshell-pypi.yml
index 1d95cb9911..e74314eca8 100644
--- a/.github/workflows/ci-ifcopenshell-pypi.yml
+++ b/.github/workflows/ci-ifcopenshell-pypi.yml
@@ -60,12 +60,12 @@ jobs:
       - name: Compile
         run: |
           pip install build
-          cp -r src/ifcopenshell-python src/ifcopenshell-python_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          cd src/ifcopenshell-python_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          cp -r src/ifcopenshell-python src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
           make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcopenshell-python_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist
+          packages_dir: src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist
diff --git a/src/ifcopenshell-python/Makefile b/src/ifcopenshell-python/Makefile
index 571927fded..5cc671c69c 100644
--- a/src/ifcopenshell-python/Makefile
+++ b/src/ifcopenshell-python/Makefile
@@ -87,7 +87,7 @@ else
 endif
 	rm -rf dist/working
 	python -m build
-	cd dist && mv ifcopenshell_python-0.7.0-py3-none-any.whl ifcopenshell_python-0.7.0-$(VERSION)-$(PYVERSION)-none-$(PLATFORMTAG).whl
+	cd dist && mv ifcopenshell-0.7.0-py3-none-any.whl ifcopenshell-0.7.0-$(VERSION)-$(PYVERSION)-none-$(PLATFORMTAG).whl
 	rm -rf dist/ifcopenshell
-	rm -rf dist/ifcopenshell_python.egg-info
-	rm -rf dist/ifcopenshell-python-0.7.0.tar.gz
+	rm -rf dist/ifcopenshell.egg-info
+	rm -rf dist/ifcopenshell-0.7.0.tar.gz
diff --git a/src/ifcopenshell-python/pyproject.toml b/src/ifcopenshell-python/pyproject.toml
index a96d96a7f1..8d94dc23a6 100644
--- a/src/ifcopenshell-python/pyproject.toml
+++ b/src/ifcopenshell-python/pyproject.toml
@@ -2,7 +2,7 @@
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
-name = "ifcopenshell-python"
+name = "ifcopenshell"
 version = "0.7.0"
 authors = [
   { name="Dion Moult", email="dion@thinkmoult.com" },