Skip to content
This repository was archived by the owner on Oct 5, 2023. It is now read-only.

Commit 4d59fc0

Browse files
authored
Merge pull request #14 from coreofscience/feat/rich-display-integration-with-jupyter
Start the display thing
2 parents 7b7f569 + b6380d9 commit 4d59fc0

File tree

16 files changed

+45685
-65
lines changed

16 files changed

+45685
-65
lines changed

.github/workflows/pythonpackage.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,34 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v2
22+
2223
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v1
24+
uses: actions/setup-python@v2
2425
with:
2526
python-version: ${{ matrix.python-version }}
27+
2628
- name: Install dependencies
2729
run: |
2830
python -m pip install --upgrade pip
2931
pip install -r requirements_dev.txt
32+
3033
- name: Lint with flake8
3134
run: |
3235
pip install flake8
3336
# stop the build if there are Python syntax errors or undefined names
3437
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
3538
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
3639
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
40+
3741
- name: Test with pytest
3842
run: |
3943
pip install -e .
4044
pip install pytest
4145
pytest
46+
47+
- name: Test with sample data
48+
run: |
49+
sap describe data/sample.isi
50+
sap root data/sample.isi
51+
sap trunk data/sample.isi
52+
sap leaf data/sample.isi

.github/workflows/pythonpublish.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,26 @@ jobs:
1919
uses: actions/setup-python@v2
2020
with:
2121
python-version: '3.x'
22+
2223
- name: Install dependencies
2324
run: |
2425
python -m pip install --upgrade pip
2526
pip install setuptools wheel twine
27+
pip install -r requirements_dev.txt
28+
29+
- name: Test with pytest
30+
run: |
31+
pip install -e .
32+
pip install pytest
33+
pytest
34+
35+
- name: Test with sample data
36+
run: |
37+
sap describe data/sample.isi
38+
sap root data/sample.isi
39+
sap trunk data/sample.isi
40+
sap leaf data/sample.isi
41+
2642
- name: Build and publish
2743
env:
2844
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

CONTRIBUTING.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
Contributing
2-
============
1+
# Contributing
32

43
Contributions are welcome, and they are greatly appreciated! Every
54
little bit helps, and credit will always be given.
65

76
You can contribute in many ways:
87

9-
Types of Contributions
10-
----------------------
8+
## Types of Contributions
119

1210
### Report Bugs
1311

@@ -50,8 +48,7 @@ If you are proposing a feature:
5048
- Remember that this is a volunteer-driven project, and that
5149
contributions are welcome :)
5250

53-
Get Started!
54-
------------
51+
## Get Started!
5552

5653
Ready to contribute? Here\'s how to set up [python\_tos]{.title-ref} for
5754
local development.
@@ -103,8 +100,7 @@ local development.
103100

104101
7. Submit a pull request through the GitHub website.
105102

106-
Pull Request Guidelines
107-
-----------------------
103+
# Pull Request Guidelines
108104

109105
Before you submit a pull request, check that it meets these guidelines:
110106

HISTORY.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
History
2-
=======
1+
# History
32

4-
0.1.0 (2020-01-26)
5-
------------------
3+
## 1.0.0 (2020-08-15)
64

7-
- First release on PyPI.
5+
- Added a new Jupyter visualization.
6+
- Updated the python wostools dependency to the new version.
7+
- Got the API at production level.
8+
9+
## 0.1.1 (2020-05-20)
10+
11+
- New stable API.
12+
13+
## 0.1.0 (2020-01-26)
14+
15+
- First release on PyPI.

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ recursive-include tests *
77
recursive-exclude * __pycache__
88
recursive-exclude * *.py[co]
99

10-
recursive-include docs *.md conf.py Makefile make.bat *.jpg *.png *.gif
10+
recursive-include docs *.md conf.py Makefile make.bat *.jpg *.png *.gif *.html

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ to explore all the commands and options you can use.
5656
The Python API is quite small, here's the minimal working example:
5757

5858
```python
59-
from sap import load, Sap, CollectionLazy
59+
from sap import load, Sap, CachedCollection
6060

6161
sap = Sap()
62-
graph = next(load(CollectionLazy(file1, file2, ...)))
63-
tree = sap.tree()
62+
graph = giant(CachedCollection(file1, file2, ...))
63+
tree = sap.tree(giant)
6464
```
6565

6666
then `tree` is an `igraph.Graph` labeled with all the things you would need

0 commit comments

Comments
 (0)