Skip to content

Commit 5b63213

Browse files
committed
instructions
1 parent cd6955e commit 5b63213

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

README.md

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
11
# COMPAS Framework
22

3-
The COMPAS framework packages
3+
A "meta package" to install the COMPAS framework packages.
44

55
## Installation
66

7-
Stable releases can be installed from PyPI.
7+
For installation without `compas_occ`.
88

99
```bash
1010
pip install compas_framework
1111
```
1212

13-
To install the latest version for development, do:
13+
For installation with `compas_occ`.
1414

1515
```bash
16-
git clone https://github.com/compas-dev/compas_framework.git
17-
cd compas_framework
18-
pip install -e ".[dev]"
19-
```
20-
21-
To install with support for Jupyter notebooks, do:
22-
23-
```bash
24-
git clone https://github.com/compas-dev/compas_framework.git
25-
cd compas_framework
26-
pip install -e ".[notebook]"
16+
conda create -n compas-dev -c conda-forge compas_occ
17+
conda activate compas-dev
18+
pip install compas_framework
2719
```
2820

2921
## Documentation
3022

31-
For further "getting started" instructions, a tutorial, examples, and an API reference,
32-
please check out the online documentation here: [COMPAS Framework docs](https://compas-dev.github.io/compas_framework)
23+
For more information, check out the online documentation here: [COMPAS Framework docs](https://compas.dev/compas_framework)
3324

3425
## Issue Tracker
3526

docs/index.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ compas_framework
44

55
.. rst-class:: lead
66

7-
The COMPAS framework packages
8-
9-
.. .. figure:: /_images/
10-
:figclass: figure
11-
:class: figure-img img-fluid
7+
`compas_framework` is a "meta package" that can be used to simplify the installation of the base framework of COMPAS.
128

139

1410
Table of Contents

docs/installation.rst

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,34 @@ Installation
55
Stable
66
======
77

8-
Stable releases are available on PyPI and can be installed with pip.
8+
For installation WITHOUT `compas_occ`
99

1010
.. code-block:: bash
1111
1212
pip install compas_framework
1313
14+
For installation WITH `compas_occ`
1415

15-
Latest
16-
======
16+
.. code-block:: bash
1717
18-
The latest version can be installed from local source.
18+
conda create -n compas-dev -c conda-forge compas_occ
19+
conda activate compas-dev
20+
pip install compas_framework
21+
22+
In both cases, for installation with support for Jupyter notebooks
1923

2024
.. code-block:: bash
2125
22-
git clone https://github.com/compas-dev/compas_framework.git
23-
cd compas_tna
24-
pip install -e .
26+
pip install "compas_framework[notebook]"
2527
2628
2729
Development
2830
===========
2931

30-
To install `compas_framework` for development, install from local source with the "dev" requirements.
32+
To install `compas_framework` for development, install from local source.
3133

3234
.. code-block:: bash
3335
3436
git clone https://github.com/compas-dev/compas_framework.git
35-
cd compas_tna
36-
pip install -e ".[dev]"
37+
cd compas_framework
38+
conda env create -f environment.yml

environment.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: compas-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python
6+
- pip
7+
- compas_occ >=1.3
8+
- pip:
9+
- .
10+
- -r requirements-dev.txt
11+
- -r requirements-notebook.txt

0 commit comments

Comments
 (0)