Skip to content

Commit fe42f9b

Browse files
paulnovopaulnovo
committed
Merge branch 'master' into make-flip-and-zoom-nd-compatible
2 parents a514e33 + f465149 commit fe42f9b

Some content is hidden

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

58 files changed

+1246
-758
lines changed

‎.github/workflows/CleanPreview.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# from https://github.com/CliMA/ClimaTimeSteppers.jl
2+
name: Doc Preview Cleanup
3+
4+
on:
5+
pull_request:
6+
types: [closed]
7+
8+
jobs:
9+
doc-preview-cleanup:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout gh-pages branch
13+
uses: actions/checkout@v2
14+
with:
15+
ref: gh-pages
16+
- name: Delete preview and history + push changes
17+
run: |
18+
if [ -d "previews/PR$PRNUM" ]; then
19+
git config user.name "Documenter.jl"
20+
git config user.email "[email protected]"
21+
git rm -rf "previews/PR$PRNUM"
22+
git commit -m "delete preview"
23+
git branch gh-pages-new $(echo "delete history" | git commit-tree HEAD^{tree})
24+
git push --force origin gh-pages-new:gh-pages
25+
fi
26+
env:
27+
PRNUM: ${{ github.event.number }}

‎.github/workflows/CompatHelper.yml

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,44 @@ name: CompatHelper
22
on:
33
schedule:
44
- cron: 0 0 * * *
5+
workflow_dispatch:
6+
permissions:
7+
contents: write
8+
pull-requests: write
59
jobs:
6-
build:
10+
CompatHelper:
711
runs-on: ubuntu-latest
812
steps:
9-
- name: Pkg.add("CompatHelper")
10-
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
11-
- name: CompatHelper.main()
12-
run: julia -e 'using CompatHelper; CompatHelper.main()'
13+
- name: Check if Julia is already available in the PATH
14+
id: julia_in_path
15+
run: which julia
16+
continue-on-error: true
17+
- name: Install Julia, but only if it is not already available in the PATH
18+
uses: julia-actions/setup-julia@v1
19+
with:
20+
version: '1'
21+
arch: ${{ runner.arch }}
22+
if: steps.julia_in_path.outcome != 'success'
23+
- name: "Add the General registry via Git"
24+
run: |
25+
import Pkg
26+
ENV["JULIA_PKG_SERVER"] = ""
27+
Pkg.Registry.add("General")
28+
shell: julia --color=yes {0}
29+
- name: "Install CompatHelper"
30+
run: |
31+
import Pkg
32+
name = "CompatHelper"
33+
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
34+
version = "3"
35+
Pkg.add(; name, uuid, version)
36+
shell: julia --color=yes {0}
37+
- name: "Run CompatHelper"
38+
run: |
39+
import CompatHelper
40+
CompatHelper.main()
41+
shell: julia --color=yes {0}
1342
env:
1443
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
45+
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

‎.github/workflows/PRComment.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Doc Preview PR Comment
2+
on:
3+
pull_request:
4+
types: [labeled]
5+
jobs:
6+
pr_comment:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Create PR comment
10+
if: github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name && github.event.label.name == 'documentation' # if this is a pull request build AND the pull request is NOT made from a fork
11+
uses: thollander/actions-comment-pull-request@71efef56b184328c7ef1f213577c3a90edaa4aff
12+
with:
13+
message: 'Once the documentation build has completed, you can preview any updated documentation at this URL: https://fluxml.ai/DataAugmentation.jl/previews/PR${{ github.event.number }}/'
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/TagBot.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
11
name: TagBot
22
on:
3-
schedule:
4-
- cron: 0 * * * *
3+
issue_comment:
4+
types:
5+
- created
6+
workflow_dispatch:
7+
inputs:
8+
lookback:
9+
default: 3
10+
permissions:
11+
actions: read
12+
checks: read
13+
contents: write
14+
deployments: read
15+
issues: read
16+
discussions: read
17+
packages: read
18+
pages: read
19+
pull-requests: read
20+
repository-projects: read
21+
security-events: read
22+
statuses: read
523
jobs:
624
TagBot:
25+
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
726
runs-on: ubuntu-latest
827
steps:
928
- uses: JuliaRegistries/TagBot@v1
1029
with:
1130
token: ${{ secrets.GITHUB_TOKEN }}
31+
# Edit the following line to reflect the actual name of the GitHub Secret containing your private key
32+
ssh: ${{ secrets.DOCUMENTER_KEY }}
33+
# ssh: ${{ secrets.NAME_OF_MY_SSH_PRIVATE_KEY_SECRET }}

‎.github/workflows/ci.yml

Lines changed: 61 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,80 @@
11
name: CI
2+
23
on:
3-
- push
4-
- pull_request
4+
push:
5+
branches: ['master']
6+
pull_request:
7+
branches: ['master']
8+
9+
concurrency:
10+
# Skip intermediate builds: always.
11+
# Cancel intermediate builds: only if it is a pull request build.
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14+
515
jobs:
616
test:
7-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
17+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
818
runs-on: ${{ matrix.os }}
919
strategy:
20+
fail-fast: false
1021
matrix:
1122
version:
12-
- '1.6'
13-
- '1.8'
23+
- '1'
24+
- '1.6' # this is the oldest compat
25+
- 'nightly'
1426
os:
1527
- ubuntu-latest
1628
- macOS-latest
1729
- windows-latest
1830
arch:
1931
- x64
32+
- x86
33+
exclude:
34+
- os: macOS-latest
35+
arch: x86
2036
steps:
21-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v3
2238
- uses: julia-actions/setup-julia@v1
2339
with:
2440
version: ${{ matrix.version }}
2541
arch: ${{ matrix.arch }}
26-
- uses: julia-actions/julia-buildpkg@latest
27-
- uses: julia-actions/julia-runtest@latest
28-
42+
- uses: actions/cache@v3
43+
env:
44+
cache-name: cache-artifacts
45+
with:
46+
path: ~/.julia/artifacts
47+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
48+
restore-keys: |
49+
${{ runner.os }}-test-${{ env.cache-name }}-
50+
${{ runner.os }}-test-
51+
${{ runner.os }}-
52+
- uses: julia-actions/julia-buildpkg@v1
53+
- uses: julia-actions/julia-runtest@v1
54+
docs:
55+
name: Documentation
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v2
59+
- uses: julia-actions/setup-julia@v1
60+
with:
61+
version: '1.6'
62+
- run: |
63+
julia --project=docs -e '
64+
using Pkg
65+
Pkg.develop(PackageSpec(path=pwd()))
66+
Pkg.instantiate()'
67+
- run: |
68+
julia --color=yes --project=docs/ -e '
69+
using DataAugmentation
70+
using Documenter
71+
using Documenter: doctest
72+
DocMeta.setdocmeta!(DataAugmentation,
73+
:DocTestSetup,
74+
:(using DataAugmentation);
75+
recursive=true)
76+
doctest(DataAugmentation)'
77+
- run: julia --project=docs docs/make.jl
78+
env:
79+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
80+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

‎.github/workflows/pollenbuild.yml

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

‎.github/workflows/pollenstatic.yml

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

‎CHANGELOG.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,64 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## [Unreleased]
1010

11+
## [0.3.0]
12+
13+
### Added
14+
15+
- Add `PermuteDims` transformation
16+
17+
### Changed
18+
19+
- `ImageToTensor` now returns arrays in `WHC` format instead of `HWC`
20+
21+
## [0.2.12]
22+
23+
### Added
24+
25+
- Added optional `clamp` flag to `AdjustBrightness` and `AdjustContrast`
26+
27+
### Changed
28+
29+
- Transfered repository to FluxML
30+
31+
## [0.2.11]
32+
33+
### Fixed
34+
35+
- Bump Setfield compat
36+
37+
## [0.2.10]
38+
39+
### Fixed
40+
41+
- Fix `RandomCrop` transform
42+
43+
## [0.2.9]
44+
45+
### Added
46+
47+
- Set up Pollen.jl documentation
48+
49+
### Fixed
50+
51+
- Fix deprecated call to `warp`
52+
53+
## [0.2.8]
54+
55+
### Fixed
56+
57+
- Fix compatibility with ImageTransformations 0.9
58+
59+
## [0.2.7]
60+
61+
### Changed
62+
63+
- Replace Images.jl dependency with ImageCore.jl
64+
65+
### Fixed
66+
67+
- Fix crop-projective composition
68+
1169
## [0.2.6]
1270

1371
### Fixed

0 commit comments

Comments
 (0)