Skip to content

Commit bc3eea1

Browse files
authored
Merge branch 'main' into bye-twitter
2 parents 7948448 + e73b4b5 commit bc3eea1

File tree

9 files changed

+203
-208
lines changed

9 files changed

+203
-208
lines changed

.github/workflows/_conda-build.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,29 @@ jobs:
4343
if: github.ref_type == 'tag'
4444
run: sed -i "s/0.0.0/${{ env.tag }}/g" kelp_o_matic/__init__.py
4545

46-
- name: Setup Mambaforge
47-
uses: conda-incubator/setup-miniconda@v3
46+
- name: Setup Mamba
47+
uses: mamba-org/setup-micromamba@v2
4848
with:
49-
python-version: ${{ inputs.python-version }}
50-
mamba-version: "*"
51-
channels: pytorch,nvidia,conda-forge,defaults
52-
channel-priority: true
53-
auto-update-conda: true
54-
activate-environment: my-env
55-
miniforge-variant: Mambaforge
56-
use-mamba: true
49+
environment-name: build-env
50+
create-args: >-
51+
python=${{ inputs.python-version }}
52+
rattler-build
53+
anaconda-client
54+
-c pytorch -c nvidia -c conda-forge
55+
cache-downloads: true
56+
cache-downloads-key: ${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_NUMBER }}
57+
init-shell: bash
5758

58-
- name: Install build packages
59-
run: mamba install -y boa anaconda-client
59+
- name: Verify rattler-build installation
60+
run: rattler-build --version
6061

6162
- name: Build package
62-
run: |
63-
cd conda
64-
conda mambabuild --output-folder . .
63+
run: rattler-build build -r conda/recipe.yaml
6564

6665
- name: Publish package
6766
if: inputs.should-upload
6867
env:
6968
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
7069
run: |
71-
cd conda
70+
cd output
7271
anaconda upload --label main noarch/*.tar.bz2

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build:
1515
strategy:
1616
matrix:
17-
python-version: ["3.9", "3.10", "3.11"]
17+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1818
os: ["ubuntu-latest", "windows-latest"]
1919
uses: ./.github/workflows/_conda-build.yml
2020
with:

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ jobs:
2424
- Windows
2525
- MacOs
2626
py:
27+
- "3.13"
28+
- "3.12"
2729
- "3.11"
2830
- "3.10"
29-
- "3.9"
3031
steps:
3132
- uses: actions/checkout@v4
3233
- name: Setup python for test ${{ matrix.py }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,3 +275,5 @@ conda/index.html
275275
.idea/
276276

277277
*.profile
278+
279+
output

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: 2
22

33
build:
4-
os: "ubuntu-20.04"
4+
os: "ubuntu-24.04"
55
tools:
6-
python: "3.9"
6+
python: "3.10"
77

88
mkdocs:
99
configuration: mkdocs.yml

conda/meta.yaml

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

conda/recipe.yaml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
schema_version: 1
2+
3+
context:
4+
git_tag: ${{ env.get('GIT_DESCRIBE_TAG', default="v0.0.0") }}
5+
version: ${{ git_tag[1:] }}
6+
7+
package:
8+
name: kelp-o-matic
9+
version: ${{ version }}
10+
11+
source:
12+
path: ../
13+
14+
build:
15+
number: 0
16+
noarch: python
17+
script: ${{ PYTHON }} -m pip install . -vv
18+
python:
19+
entry_points:
20+
- kom = kelp_o_matic.cli:cli
21+
22+
requirements:
23+
host:
24+
- python >=3.10
25+
- poetry-core
26+
- pip
27+
run:
28+
- python >=3.10
29+
- numpy >=1.24.2
30+
- pytorch >=2.1.0, <3
31+
- fsspec
32+
- rasterio >=1.3.7, <2
33+
- rich >=13.5, <14
34+
- torchvision >=0.16.1
35+
- typer >=0.9.0
36+
- packaging >=24.1, <25
37+
run_constraints:
38+
- pytorch-cuda >=11.8
39+
40+
tests:
41+
- python:
42+
imports:
43+
- kelp_o_matic
44+
- kelp_o_matic.geotiff_io
45+
- requirements:
46+
run:
47+
- python >=3.10
48+
- pip
49+
script:
50+
- pip check
51+
- kom --help
52+
53+
about:
54+
summary: Segmentation Tools for Remotely Sensed RPAS Imagery
55+
license: MIT
56+
license_file: LICENSE.txt
57+
homepage: https://github.com/HakaiInstitute/kelp-o-matic
58+
repository: https://github.com/HakaiInstitute/kelp-o-matic
59+
documentation: https://kelp-o-matic.readthedocs.io
60+
61+
extra:
62+
recipe-maintainers:
63+
- tayden
64+

0 commit comments

Comments
 (0)