Skip to content

Commit 73877fc

Browse files
committed
Merge branch 'main' into feature/scale_box
2 parents c71f5b9 + e3fe84a commit 73877fc

File tree

92 files changed

+5211
-2515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5211
-2515
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.1.0
2+
current_version = 1.3.0
33
message = Bump version to {new_version}
44
commit = True
55
tag = True

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest, macos-latest, windows-latest]
17-
python-version: [3.6, 3.7, 3.8]
17+
python-version: [3.6, 3.7, 3.8, 3.9]
1818

1919
steps:
2020
- uses: actions/checkout@v2

.github/workflows/cleanup.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
build:
1515
name: build and deploy docs
1616
runs-on: ubuntu-latest
17+
outputs:
18+
commit_type: ${{ steps.docs.outputs.commit_type }}
19+
current_patch: ${{ steps.docs.outputs.current_patch }}
1720
env:
1821
GH_PAT: ${{secrets.GH_PAT}}
1922
steps:
@@ -31,7 +34,8 @@ jobs:
3134
run: |
3235
python -m pip install --no-cache-dir -r requirements-dev.txt
3336
- name: Generate docs
34-
if: ${{ success() }}
37+
if: success()
38+
id: docs
3539
run: |
3640
invoke docs
3741
# Get branch/tag/latest name from git
@@ -40,19 +44,23 @@ jobs:
4044
if [[ $BASH_REMATCH = pull* ]]; then
4145
echo This is a pull request
4246
FOLDER_NAME=pull_${BASH_REMATCH##*/}
47+
echo "::set-output name=commit_type::pull"
4348
elif [[ $BASH_REMATCH = tags/* ]]; then
4449
echo This is a version tag
4550
FOLDER_NAME=${BASH_REMATCH##*/v}
51+
echo "::set-output name=commit_type::tag"
52+
echo "::set-output name=current_patch::$FOLDER_NAME"
4653
else
4754
echo This is a commit to main branch
4855
FOLDER_NAME=latest
56+
echo "::set-output name=commit_type::main"
4957
fi;
5058
fi;
5159
echo "Docs will be deployed to https://compas.dev/compas/$FOLDER_NAME"
5260
mkdir -p deploy/$BRANCH_OR_TAG && mv -T dist/docs deploy/$FOLDER_NAME/
5361
5462
- name: Deploy docs
55-
if: success() && env.GH_PAT != ''
63+
if: success() && env.GH_PAT != '' && steps.docs.outputs.commit_type != 'pull'
5664
uses: crazy-max/ghaction-github-pages@v2
5765
with:
5866
target_branch: gh-pages
@@ -63,27 +71,36 @@ jobs:
6371

6472
docVersions:
6573
needs: build
74+
if: needs.build.outputs.commit_type == 'tag'
6675
name: update doc versions
6776
runs-on: ubuntu-latest
6877
env:
6978
GH_PAT: ${{secrets.GH_PAT}}
79+
CURRENT_PATCH: ${{needs.build.outputs.current_patch}}
7080
steps:
71-
7281
- uses: actions/checkout@v2
7382
with:
7483
ref: gh-pages
7584

7685
- name: update doc versions
7786
run: |
78-
>doc_versions.txt
87+
echo latest > doc_versions.txt
88+
CURRENT_MINOR=${CURRENT_PATCH%.*}
89+
echo current patch: $CURRENT_PATCH current minor: $CURRENT_MINOR
7990
for folder in $(ls -rd */ | tr -d '/')
8091
do
81-
if [[ $folder =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$|^latest$ ]]
82-
then
83-
echo ${folder} >> doc_versions.txt
92+
if [[ $folder =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$ ]]; then
93+
PATCH=$folder
94+
MINOR=${folder%.*}
95+
if [[ $PATCH != $CURRENT_PATCH && $MINOR = $CURRENT_MINOR ]]; then
96+
echo $PATCH will be deleted
97+
rm -Rf $PATCH
98+
else
99+
echo $PATCH >> doc_versions.txt
100+
fi
84101
fi
85102
done
86-
echo found available doc versions:
103+
echo updated doc versions:
87104
cat doc_versions.txt
88105
89106
- name: Deploy docs

AUTHORS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@
2828
- Beverly Lytle <<[email protected]>> [@beverlylytle](https://github.com/beverlylytle>)
2929
- Juney Lee <<[email protected]>> [@juney-lee](https://github.com/juney-lee)
3030
- Xingxin He <<[email protected]>> [@XingxinHE](https://github.com/XingxinHE)
31-
- Robin Godwyll <<[email protected]>> [@robin-gdwl](https://github.com/robin-gdwl)
31+
- Robin Godwyll <<[email protected]>> [@robin-gdwl](https://github.com/robin-gdwl)
32+
- Mattis Koh <<[email protected]>> [@mattiskoh](https://github.com/mattiskoh)

CHANGELOG.md

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,78 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010

1111
### Added
1212

13+
* Added crease handling to catmull-clark subdivision scheme.
14+
* Added Python 3.9 support
15+
1316
### Changed
1417

15-
* Fixed bug where mimic joints were considered configurable.
1618
* Fixed box scaling.
1719

1820
### Removed
1921

2022

23+
## [1.3.0] 2021-03-26
24+
25+
### Added
26+
27+
* Added a `invert` and `inverted` method `compas.geometry.Vector`.
28+
* Added unetary `__neg__` operator for `compas.geometry.Vector`.
29+
* Added `compas.robots.Configuration`, moved from `compas_fab`.
30+
31+
### Changed
32+
33+
* Fixed rhino packages installation to remove duplicates
34+
35+
### Removed
36+
37+
38+
## [1.2.1] 2021-03-19
39+
40+
### Added
41+
42+
### Changed
43+
44+
### Removed
45+
46+
* Fixed API removals from 1.0.0 -> 1.2.0
47+
48+
49+
## [1.2.0] 2021-03-18
50+
51+
### Added
52+
53+
* Added `divide_polyline`, `divide_polyline_by_length`, `Polyline.split_at_corners` and `Polyline.tangent_at_point_on_polyline`.
54+
* Added the magic method `__str__` to `compas.geoemetry.Transformation`.
55+
* Added `redraw` flag to the `compas_rhino` methods `delete_object`, `delete_objects` and `purge_objects`.
56+
* Added the `__eq__` method for `compas.geometry.Circle` and `compas.geometry.Line`.
57+
* Added support for Pylance through static API definitions.
58+
* Added `halfedge_strip` method to `compas.datastructures.HalfEdge`.
59+
60+
### Changed
61+
62+
* Fixed bug where mimic joints were considered configurable.
63+
* Fixed bug where `!=` gave incorrect results in Rhino for some compas objects.
64+
* Fixed bug where `compas_rhino.BaseArtist.redraw` did not trigger a redraw.
65+
* Fixed minor bugs in `compas.geometry.Polyline` and `compas.geometry.Polygon`.
66+
* Fixed very minor bugs in `compas.geometry.Frame` and `compas.geometry.Quaternion`.
67+
* Fixed bug in `compas_rhino.objects.MeshObject.modify`.
68+
* Fixed bug in `compas_rhino.objects.MeshObject.modify_vertices`.
69+
* Fixed bug in `compas_rhino.objects.MeshObject.modify_edges`.
70+
* Fixed bug in `compas_rhino.objects.MeshObject.modify_faces`.
71+
* Fixed bug in `compas_rhino.objects.VolMeshObject.modify`.
72+
* Fixed bug in `compas_rhino.objects.VolMeshObject.modify_vertices`.
73+
* Fixed bug in `compas_rhino.objects.VolMeshObject.modify_edges`.
74+
* Fixed bug in `compas_rhino.objects.VolMeshObject.modify_faces`.
75+
* Fixed bug in `compas_rhino.objects.NetworkObject.modify`.
76+
* Fixed bug in `compas_rhino.objects.NetworkObject.modify_vertices`.
77+
* Fixed bug in `compas_rhino.objects.NetworkObject.modify_edges`.
78+
* Changed `compas_rhino.objects.inspect` to `compas_rhino.objects.inspectors`.
79+
* Changed `compas_rhino.objects.select` to `compas_rhino.objects._select`.
80+
* Changed `compas_rhino.objects.modify` to `compas_rhino.objects._modify`.
81+
82+
### Removed
83+
84+
2185
## [1.1.0] 2021-02-12
2286

2387
### Added

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/COMPAS.svg)](https://pypi.python.org/project/COMPAS)
66
[![PyPI - Latest Release](https://img.shields.io/pypi/v/COMPAS.svg)](https://pypi.python.org/project/COMPAS)
77
[![Conda - Latest Release](https://anaconda.org/conda-forge/compas/badges/version.svg)](https://anaconda.org/conda-forge/compas)
8+
[![Conda - Platform](https://img.shields.io/conda/pn/conda-forge/compas)](https://anaconda.org/conda-forge/compas)
89
[![DOI](https://zenodo.org/badge/104857648.svg)](https://zenodo.org/badge/latestdoi/104857648)
10+
[![Twitter Follow](https://img.shields.io/twitter/follow/compas_dev?style=social)](https://twitter.com/compas_dev)
911

1012
The **COMPAS** framework is an open-source, Python-based framework for computational research and collaboration in architecture, engineering, digital fabrication and construction.
1113

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def patched_m2r2_setup(app):
3838
copyright = "Block Research Group - ETH Zurich"
3939
author = "Tom Van Mele"
4040

41-
release = "1.1.0"
41+
release = "1.3.0"
4242
version = ".".join(release.split(".")[0:2])
4343

4444
master_doc = "index"
@@ -342,6 +342,7 @@ def linkcode_resolve(domain, info):
342342
html_last_updated_fmt = ""
343343
html_copy_source = False
344344
html_show_sourcelink = False
345+
html_permalinks = False
345346
html_add_permalinks = ""
346347
html_experimental_html5_writer = True
347348
html_compact_lists = True

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ matplotlib >= 3.1; python_version >= '3.8' and sys_platform == 'win32'
1010
matplotlib >= 2.2; python_version >= '3.5' and sys_platform != 'win32'
1111
networkx
1212
numba
13-
numpy >= 1.15.4, <= 1.19.3; sys_platform == 'win32'
14-
numpy >=1.15.4; sys_platform != 'win32'
13+
numpy >= 1.15.4
1514
pillow
1615
planarity
1716
pycollada

schemas/graph.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"$id": "https://github.com/compas-dev/compas/schemas/graph.json",
4-
"$compas": "1.1.0",
4+
"$compas": "1.3.0",
55

66
"type": "object",
77
"poperties": {

0 commit comments

Comments
 (0)