Skip to content

Commit d5f48cd

Browse files
authored
Merge branch 'main' into where-api
2 parents af38bbf + 96ecee2 commit d5f48cd

File tree

11 files changed

+45
-737
lines changed

11 files changed

+45
-737
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818
* Added `compas.datastructures.VolMesh.from_meshgrid`.
1919
* Added `vertices_where`, `vertices_where_predicate`, `edges_where`, `edges_where_predicate` to `compas.datastructures.HalfFace`.
2020
* Added `faces_where`, `faces_where_predicate`, `cells_where`, `cells_where_predicate` to `compas.datastructures.HalfFace`.
21+
* Added `3.1` to supported versions for Blender installer.
2122

2223
### Changed
2324

@@ -33,6 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3334
* Changed `compas_ghpython.artists.MeshArtist.draw_vertexlabels` to use the colors of the vertex color dict.
3435
* Changed `compas_ghpython.artists.MeshArtist.draw_edgelabels` to use the colors of the edge color dict.
3536
* Changed `compas_ghpython.artists.MeshArtist.draw_facelabels` to use the colors of the face color dict.
37+
* Fixed `compas_blender.uninstall`.
38+
* Changed `planarity` to optional requirement on all platforms.
39+
* Changed `numba` to optional requirement on all platforms.
40+
* Changed raw github content path for `compas.get`.
3641
* Changed `compas.datastructures.Graph.nodes_where` to accept conditions as kwargs.
3742
* Changed `compas.datastructures.Graph.edges_where` to accept conditions as kwargs.
3843
* Changed `compas.datastructures.Halfedge.vertices_where` to accept conditions as kwargs.
@@ -45,6 +50,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4550

4651
### Removed
4752

53+
* Removed `compas.numerical.drx`.
54+
4855

4956
## [1.14.1] 2022-02-16
5057

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def patched_m2r2_setup(app):
7474
"sphinx.ext.graphviz",
7575
"matplotlib.sphinxext.plot_directive",
7676
"m2r2",
77-
"nbsphinx",
77+
# "nbsphinx",
7878
"sphinx.ext.autodoc.typehints",
7979
"tabs"
8080
]

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ matplotlib >= 2.2, < 3.1; python_version >= '3.5' and python_version <= '3.7' an
1010
matplotlib >= 3.1; python_version >= '3.8' and sys_platform == 'win32'
1111
matplotlib >= 2.2; python_version >= '3.5' and sys_platform != 'win32'
1212
networkx
13-
numba
13+
# numba
1414
numpy >= 1.15.4
1515
pillow
16-
planarity ; sys_platform != 'win32'
16+
# planarity ; sys_platform != 'win32'
1717
pycollada
1818
schema
1919
scipy >= 1.1

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def read(*names, **kwargs):
6767
python_requires='>=2.7',
6868
extras_require={
6969
'planarity': ['planarity'],
70+
'numba': ['numba']
7071
},
7172
entry_points={
7273
'console_scripts': [

src/compas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def get(filename):
212212
if os.path.exists(localpath):
213213
return localpath
214214
else:
215-
return "https://github.com/compas-dev/compas/raw/main/samples/{}".format(filename)
215+
return "https://raw.githubusercontent.com/compas-dev/compas/main/src/compas/data/samples/{}".format(filename)
216216

217217

218218
def get_bunny(localstorage=None):

src/compas/numerical/drx/__init__.py

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

0 commit comments

Comments
 (0)