Skip to content

Commit 7492e59

Browse files
authored
Merge branch 'main' into creased-subd
2 parents a2a5731 + 2444a62 commit 7492e59

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

.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

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
### Added
1212

1313
* Added crease handling to catmull-clark subdivision scheme.
14+
* Added Python 3.9 support
1415

1516
### Changed
1617

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

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def read(*names, **kwargs):
4848
'Programming Language :: Python :: 3.6',
4949
'Programming Language :: Python :: 3.7',
5050
'Programming Language :: Python :: 3.8',
51+
'Programming Language :: Python :: 3.9',
5152
'Programming Language :: Python :: Implementation :: CPython',
5253
],
5354
keywords=['architecture', 'engineering', 'fabrication', 'construction'],

src/compas_blender/install.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ def install(blender_path):
6262
print('Conda environment not found. The installation into Blender requires an active conda environment with a matching Python version to continue.')
6363
sys.exit(-1)
6464

65+
if not os.path.exists(blender_path):
66+
raise FileNotFoundError('Blender version folder not found.')
67+
6568
path, version = os.path.split(blender_path)
6669

6770
print('Installing COMPAS for Blender {}'.format(version))

0 commit comments

Comments
 (0)