Skip to content

Commit cd09b97

Browse files
alcarneyalcarney
authored
Merge pull request #259 from swyddfa/develop
New Release v0.10.0
2 parents 462fa75 + ffb065a commit cd09b97

Some content is hidden

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

61 files changed

+2114
-1492
lines changed

‎.github/workflows/blog-release.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,31 @@ jobs:
3939
python --version
4040
4141
python -m pip install --upgrade pip
42-
python -m pip install --pre arlunio
42+
python -m pip install .
4343
python -m pip install -r blog/requirements.txt
4444
# </build-job-setup>
4545

4646
# <build-job-blog>
4747
- name: Build Gallery
4848
run: |
49-
cd blog
49+
cd docs
50+
make nbgallery
51+
52+
ls -1 _build/nbgallery/examples/
53+
cp _build/nbgallery/examples/*.ipynb ../blog/src/gallery
54+
55+
cd ../blog
5056
python gallery.py
5157
5258
# </build-job-blog>
53-
5459
# <build-job-deploy>
60+
- name: Publish Release Artifact
61+
uses: actions/[email protected]
62+
with:
63+
name: 'blog'
64+
path: blog/public
65+
if: github.event_name == 'pull_request'
66+
5567
- name: Deploy
5668
uses: JamesIves/github-pages-deploy-action@releases/v3
5769
with:

‎.github/workflows/docs-release.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
5454
cd docs
5555
make html
56+
make nbtutorial
5657
# </build-job-docs>
5758

5859
# <build-job-artifact>
@@ -64,7 +65,7 @@ jobs:
6465
# </build-job-artifact>
6566

6667
# <build-job-deploy>
67-
- name: Deploy
68+
- name: Deploy HTML Docs
6869
uses: JamesIves/github-pages-deploy-action@releases/v3
6970
with:
7071
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
@@ -73,4 +74,14 @@ jobs:
7374
FOLDER: docs/_build/html
7475
TARGET_FOLDER: docs/
7576
if: github.event_name != 'pull_request'
77+
78+
- name: Deploy Tutorial Notebooks
79+
uses: JamesIves/github-pages-deploy-action@releases/v3
80+
with:
81+
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
82+
BASE_BRANCH: develop
83+
BRANCH: gh-pages
84+
FOLDER: docs/_build/nbtutorial/
85+
TARGET_FOLDER: tutorial/
86+
if: github.event_name != 'pull_request'
7687
# </build-job-deploy>

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
.coverage
44
.hypothesis
55
.ipynb_checkpoints/
6-
.scratch
76
.pytest_cache
87
.mypy_cache
98
.tox

‎.scratch/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "python",
66
"request": "launch",
77
"name": "Pytest: Current File",
8-
"program": "${workspaceFolder}/.dev/bin/pytest",
8+
"program": "${workspaceFolder}/.env/bin/pytest",
99
"args": [
1010
"${file}"
1111
]

‎.vscode/settings.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"build": true,
1010
"dist": true,
1111
"pip-wheel-metadata": true,
12-
".dev": true,
1312
"htmlcov": true,
1413
".coverage": true,
1514
"coverage.xml": true,

‎.vscode/tasks.json‎

Lines changed: 79 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -22,53 +22,41 @@
2222
}
2323
},
2424
{
25-
"label": "Build Docs",
25+
"label": "Build Package",
2626
"type": "shell",
27-
"command": "source ${workspaceRoot}/.env/bin/activate && sphinx-autobuild -E -a -b html docs/ docs/_build/",
28-
"problemMatcher": [],
27+
"command": "${config:python.pythonPath} -m tox -e pkg",
2928
"group": "build",
30-
"options": {
31-
"cwd": "${workspaceRoot}"
32-
}
29+
"problemMatcher": []
3330
},
3431
{
35-
"label": "Build Tutorial",
32+
"label": "Jupyter",
3633
"type": "shell",
37-
"command": "source ${workspaceRoot}/.env/bin/activate && sphinx-build -M nbtutorial docs/ docs/_build/ -E -a",
34+
"command": "source ${workspaceRoot}/.env/bin/activate && jupyter-lab ${input:jupyterArgs}",
3835
"problemMatcher": [],
3936
"group": "build",
37+
"isBackground": true,
4038
"options": {
41-
"cwd": "${workspaceRoot}"
39+
"cwd": "${input:jupyterWd}"
4240
}
4341
},
4442
{
45-
"label": "Edit Gallery",
46-
"type": "shell",
47-
"command": "source ${workspaceRoot}/.env/bin/activate && jupyter-lab --no-browser",
48-
"problemMatcher": [],
49-
"group": "build",
50-
"options": {
51-
"cwd": "${workspaceRoot}/blog/src/gallery"
52-
}
53-
},
54-
{
55-
"label": "Edit Gallery (browser)",
43+
"label": "Preview Blog",
5644
"type": "shell",
57-
"command": "source ${workspaceRoot}/.env/bin/activate && jupyter-lab",
45+
"command": "${config:python.pythonPath} -m http.server 8001",
5846
"problemMatcher": [],
5947
"group": "build",
6048
"options": {
61-
"cwd": "${workspaceRoot}/blog/src/gallery"
49+
"cwd": "${workspaceRoot}/blog/public"
6250
}
6351
},
6452
{
65-
"label": "Preview Blog",
53+
"label": "Sphinx",
6654
"type": "shell",
67-
"command": "${config:python.pythonPath} -m http.server 8001",
55+
"command": "source ${workspaceRoot}/.env/bin/activate && make ${input:builder}",
6856
"problemMatcher": [],
6957
"group": "build",
7058
"options": {
71-
"cwd": "${workspaceRoot}/blog/public"
59+
"cwd": "${workspaceRoot}/docs"
7260
}
7361
},
7462
{
@@ -103,36 +91,6 @@
10391
"options": {
10492
"cwd": "${workspaceRoot}"
10593
}
106-
},
107-
{
108-
"label": "Scratch Notebooks",
109-
"type": "shell",
110-
"command": "source ${workspaceRoot}/.env/bin/activate && jupyter-lab",
111-
"problemMatcher": [],
112-
"group": "build",
113-
"options": {
114-
"cwd": "${workspaceRoot}/.scratch"
115-
}
116-
},
117-
{
118-
"label": "Open Tutorial",
119-
"type": "shell",
120-
"command": "source ${workspaceRoot}/.env/bin/activate && jupyter-lab",
121-
"problemMatcher": [],
122-
"group": "build",
123-
"options": {
124-
"cwd": "${workspaceRoot}/docs/_build/nbtutorial/users"
125-
}
126-
},
127-
{
128-
"label": "Test File",
129-
"type": "shell",
130-
"command": "${config:python.pythonPath} -m tox -e py38 -- ${file}",
131-
"problemMatcher": [],
132-
"group": "test",
133-
"options": {
134-
"cwd": "${workspaceRoot}"
135-
}
13694
}
13795
],
13896
"inputs": [
@@ -168,10 +126,39 @@
168126
],
169127
"default": "-e py38"
170128
},
129+
{
130+
"id": "builder",
131+
"description": "Sphinx builders",
132+
"type": "pickString",
133+
"default": "html",
134+
"options": [
135+
{
136+
"label": "Build HTML Docs",
137+
"value": "html"
138+
},
139+
{
140+
"label": "Build Gallery",
141+
"value": "nbgallery"
142+
},
143+
{
144+
"label": "Build Tutorial",
145+
"value": "nbtutorial"
146+
},
147+
{
148+
"label": "Test Examples",
149+
"value": "doctest"
150+
},
151+
{
152+
"label": "Test Links",
153+
"value": "linkcheck"
154+
}
155+
]
156+
},
171157
{
172158
"id": "blogArgs",
173159
"description": "Blog Arguments",
174160
"type": "pickString",
161+
"default": "--local",
175162
"options": [
176163
{
177164
"label": "Local",
@@ -189,8 +176,43 @@
189176
"label": "Local, debug, skipping errors",
190177
"value": "-vv --local --skip-failures"
191178
}
192-
],
193-
"default": "--local"
179+
]
180+
},
181+
{
182+
"id": "jupyterArgs",
183+
"description": "Jupyter Arguments",
184+
"type": "pickString",
185+
"default": "",
186+
"options": [
187+
{
188+
"label": "Headless",
189+
"value": "--no-browser"
190+
},
191+
{
192+
"label": "In Browser",
193+
"value": ""
194+
}
195+
]
196+
},
197+
{
198+
"id": "jupyterWd",
199+
"description": "Working directory for jupyter",
200+
"type": "pickString",
201+
"default": ".scratch",
202+
"options": [
203+
{
204+
"label": "Scratch Folder",
205+
"value": ".scratch"
206+
},
207+
{
208+
"label": "Gallery",
209+
"value": "blog/src/gallery"
210+
},
211+
{
212+
"label": "Tutorial",
213+
"value": "docs/_build/nbtutorial"
214+
}
215+
]
194216
}
195217
]
196218
}

‎CHANGES.rst‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
v0.10.0 - 2020-07-10
2+
--------------------
3+
4+
Standard Library
5+
^^^^^^^^^^^^^^^^
6+
7+
- Add new definition :code:`arlunio.shape.Triangle`, also add
8+
new :code:`arlunio.math.Barycentric` definition which serves as the Triangle's base. (`#187 <https://github.com/swyddfa/arlunio/issues/187>`_)
9+
- Add :code:`arlunio.image.load` and :code:`arlunio.image.decode` functions to
10+
mirror the existing save and encode functions.
11+
12+
Update :code:`arlunio.image.Image` to now be a class in its own right, wrapping
13+
a Pillow image object to add additional functionality
14+
15+
Make the :code:`arlunio.image.fill` and :code:`arlunio.image.colorramp` functions
16+
return RGBA images to make image composition easier. (`#247 <https://github.com/swyddfa/arlunio/issues/247>`_)
17+
- Moved :code:`arlunio.pattern.Grid`, :code:`arlunio.pattern.Map` and
18+
:code:`arlunio.pattern.Pixelize` into :code:`arlunio.mask`. Also :code:`Grid` has been
19+
renamed to :code:`Repeat`. (`#249 <https://github.com/swyddfa/arlunio/issues/249>`_)
20+
21+
122
v0.0.7 - 2020-06-18
223
-------------------
324

‎MANIFEST.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ include CHANGES.rst
33
include README.md
44
include pyproject.toml
55

6-
recursive-include arlunio *.sh
7-
recursive-include arlunio *.ipynb
8-
recursive-include arlunio *.py
6+
recursive-include arlunio/tutorial *.ipynb
7+
recursive-include arlunio/tutorial *.py
8+
recursive-include arlunio/tutorial *.png
99

1010
recursive-exclude tests *.py

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Arlunio is available for Python 3.6+ and can be installed using Pip:
2929
$ pip install arlunio
3030
```
3131

32-
Be sure to check out the [documentation](https://arlunio.readthedocs.io/en/latest/)
32+
Be sure to check out the [documentation](https://www.arlun.io/docs/)
3333
(under construction) for details on how to get started with arlunio.
3434

3535
## Contributing

0 commit comments

Comments
 (0)