migration

Author: Licini

.github/workflows/build.yml

@@ -9,22 +9,16 @@ on:
       - main
 
 jobs:
-  build-package:
+  build:
     if: "!contains(github.event.pull_request.labels.*.name, 'docs-only')"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - uses: compas-dev/compas-actions.build@v1.1.1
+      - uses: compas-dev/compas-actions.build@v3
         with:
-          test_lint: true
+          python: ${{ matrix.python }}
+          invoke_lint: true

.github/workflows/docs.yml

@@ -11,52 +11,9 @@ on:
       - main
 
 jobs:
-  build:
-    name: build and deploy docs
+  docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: compas-dev/compas-actions.docs@v1.4.1
-        id: docs
-        with:
-          dest: deploy
-          build_to_subfolder: true
-
-      - name: Deploy docs
-        if: success() && steps.docs.outputs.commit_type != 'pull'
-        uses: crazy-max/ghaction-github-pages@v2
-        with:
-          target_branch: gh-pages
-          build_dir: deploy
-          keep_history: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    
-    outputs:
-      commit_type: ${{ steps.docs.outputs.commit_type }}
-      current_version: ${{ steps.docs.outputs.current_version }}
-  
-  docVersions:
-    needs: build
-    if: needs.build.outputs.commit_type == 'tag'
-    name: update doc versions
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: gh-pages
-
-      - uses: compas-dev/compas-actions.docversions@v1.3.0
-        with:
-          current_version: ${{ needs.build.outputs.current_version }}
-
-      - name: Deploy docs
-        if: success()
-        uses: crazy-max/ghaction-github-pages@v2
+      - uses: compas-dev/compas-actions.docs@v2
         with:
-          target_branch: gh-pages
-          build_dir: ./
-          keep_history: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,71 +1,30 @@
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v*'
 
 name: Create Release
 
 jobs:
-  Build:
+  build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python: ['3.8', '3.9', '3.10']
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - uses: compas-dev/compas-actions.build@v1.1.1
+      - uses: compas-dev/compas-actions.build@v3
         with:
-          test_lint: true
-          test_compas: true
+          python: ${{ matrix.python }}
+          invoke_lint: true
+          check_import: true
 
-  Release:
-    needs: Build
-    runs-on: ubuntu-latest
+  publish:
+    needs: build
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Get Version From Tag
-        id: tag_name
-        run: |
-          echo ::set-output name=current_version::${GITHUB_REF#refs/tags/v}
-        shell: bash
-
-      - name: Get Changelog Entry
-        id: changelog_reader
-        uses: mindsers/changelog-reader-action@v2
-        with:
-          version: ${{ steps.tag_name.outputs.current_version }}
-          path: ./CHANGELOG.md
-    
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: compas-dev/compas-actions.publish@v2
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ steps.changelog_reader.outputs.changes }}
-          draft: false
-          prerelease: false
-
-  Publish:
-    needs: Release
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - uses: compas-dev/compas-actions.publish@v1.0.0
-      with:
-        token: ${{ secrets.PYPI }}
+          pypi_token: ${{ secrets.PYPI }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

AUTHORS.md

@@ -1,3 +1,4 @@
 # Authors
 
 - tom van mele <<van.mele@arch.ethz.ch>> [@brgcode](https://github.com/brgcode)
+- li chen <<li.chen@arch.ethz.ch>> [@licini](https://github.com/licini)

README.md

@@ -1,3 +1,28 @@
 # COMPAS IFC
 
-Package for working with IFC files.
+## Installation
+
+Add the `conda-forge` package channel to the `conda` configuration file.
+Note that you only have to do this once.
+
+```bash
+conda config --add channels conda-forge
+```
+
+Create an environment and install the dependencies.
+
+```bash
+conda create -n ifc python=3.9 compas compas_occ compas_cgal compas_view2 ifcopenshell --yes
+```
+
+Activate the environment.
+
+```bash
+conda activate ifc
+```
+
+Install the compas_ifc package.
+
+```bash
+pip install -e .
+```

pyproject.toml

@@ -0,0 +1,26 @@
+[tool.black]
+line-length = 120
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+testpaths = ["tests"]
+python_files = [
+    "test_*.py",
+    "tests.py"
+]
+addopts = "-ra --strict --doctest-modules --doctest-glob=*.rst --tb=short"
+doctest_optionflags= "NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE ALLOW_BYTES NUMBER"
+filterwarnings = "ignore::DeprecationWarning"
+
+[tool.isort]
+line_length = 120
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+force_single_line = true
+ensure_newline_before_comments = true
+known_first_party = "compas"
+default_section = "THIRDPARTY"
+forced_separate = "test_compas"
+skip = ["__init__.py"]

requirements-dev.txt

@@ -1,9 +1,10 @@
-autopep8
+flake8
+black
 attrs >=17.4
 bump2version >=1.0.1
 check-manifest >=0.36
+compas_invocations
 doc8
-flake8
 graphviz
 invoke >=0.14
 ipykernel
@@ -12,10 +13,10 @@ isort
 m2r2
 nbsphinx
 pydocstyle
-pytest >=3.2
+pytest <7.1
 sphinx_compas_theme >=0.15.18
-sphinx >=3.4
+matplotlib
+sphinx
 twine
 wheel
-matplotlib
 -e .

requirements.txt

@@ -0,0 +1 @@
+compas >=1.16

setup.cfg

@@ -2,38 +2,16 @@
 universal = 1
 
 [flake8]
-max-line-length = 180
-exclude = */migrations/*
+max-line-length = 120
+extend-ignore =
+    # See https://github.com/PyCQA/pycodestyle/issues/373
+    E203,
+    # Only keep black line length check because flake8 forces it on comments as well
+    E501,
 
 [doc8]
-max-line-length = 180
+max-line-length = 120
 ignore = D001
 
 [pydocstyle]
 convention = numpy
-
-[tool:pytest]
-testpaths =
-    tests
-    src/compas_ifc
-norecursedirs =
-    migrations
-python_files =
-    test_*.py
-    *_test.py
-    tests.py
-addopts =
-    -ra
-    --strict
-    --doctest-modules
-    --doctest-glob=\*.rst
-    --tb=short
-
-[isort]
-force_single_line = True
-line_length = 180
-known_first_party = compas compas_ifc
-default_section = THIRDPARTY
-forced_separate = test_compas_ifc
-not_skip = __init__.py
-skip = migrations

setup.py

@@ -32,7 +32,7 @@ def read(*names, **kwargs):
     description="Package for working with IFC files.",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/blockresearchgroup/compas_ifc",
+    url="https://github.com/compas-dev/compas_ifc",
     author="tom van mele",
     author_email="van.mele@arch.ethz.ch",
     license="MIT license",

src/compas_ifc/__init__.py

@@ -9,6 +9,13 @@
 .. toctree::
     :maxdepth: 1
 
+    compas_ifc.attributes
+    compas_ifc.entities
+    compas_ifc.helpers
+    compas_ifc.model
+    compas_ifc.representation
+    compas_ifc.resources
+    compas_ifc.viewer
 
 """