Skip to content

Commit f2a2db0

Browse files
authored
Merge pull request #1 from amathislab/v1.0rc
update v1.0rc
2 parents 7d70563 + 668c4b3 commit f2a2db0

File tree

261 files changed

+75818
-107826
lines changed

Some content is hidden

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

261 files changed

+75818
-107826
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,7 @@ If applicable, add screenshots to help explain your problem.
2626
**Desktop (please complete the following information):**
2727
- OS: [e.g. iOS]
2828
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
30-
31-
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
29+
- Version of DLC2action [e.g. 22]
3630

3731
**Additional context**
3832
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ labels: ''
66
assignees: ''
77

88
---
9-
10-

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88
---
99

1010
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
11+
A clear and concise description of what the problem is. Ex. I'd really love if you I could [...]
1212

1313
**Describe the solution you'd like**
1414
A clear and concise description of what you want to happen.

.github/workflows/create-docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: create-docs
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
deploy-book:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v2
1313

14-
- name: Set up Python 3.9
14+
- name: Set up Python 3.12
1515
uses: actions/setup-python@v2
1616
with:
17-
python-version: 3.9
17+
python-version: 3.12
1818

1919
- name: Install dependencies
2020
run: |
@@ -27,7 +27,7 @@ jobs:
2727
pdoc --logo https://i.ibb.co/NstG5hz/03.png -o html_docs dlc2action
2828
2929
- name: GitHub Pages action
30-
uses: peaceiris/actions-gh-pages@v3.9.0
30+
uses: peaceiris/actions-gh-pages@v3.12.0
3131
with:
3232
github_token: ${{ secrets.GITHUB_TOKEN }}
3333
publish_dir: ./html_docs

.github/workflows/test-package.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Test package
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010
build:
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, macos-11, windows-latest]
17-
python-version: [3.8, 3.9]
17+
python-version: [3.13]
1818
include:
1919
- os: ubuntu-latest
2020
path: ~/.cache/pip
@@ -44,3 +44,4 @@ jobs:
4444
run: |
4545
pip install pytest
4646
python -m pytest
47+

.gitignore

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# custom
22
/datasets
3+
/examples/OFT
4+
/examples/DLC2Action
5+
/fly_analysis-2021-07-15
36
.vscode
47
.DS_Store
58
*.pkl
69
*.pkl.json
710
*.log.json
811
work_dirs/
9-
experiments
10-
12+
test.ipynb
1113
# Byte-compiled / optimized / DLL files for python
1214
__pycache__/
13-
*/__pycache__/
1415
*.py[cod]
1516
*$py.class
1617

@@ -55,9 +56,9 @@ coverage.xml
5556

5657
#PyCharm
5758
.idea
58-
59+
._idea/*
60+
.circleci/*
5961
#Projects
60-
./projects/*
61-
examples/*/
62-
examples/*zip
63-
62+
projects/*
63+
experiments
64+
test.ipynb

CONTRIBUTING.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# How to Contribute to DLC2Action
2+
3+
DLC2Action is an actively developed package and we welcome community development and involvement.
4+
5+
We are happy to receive code extensions, bug fixes, documentation updates, etc.
6+
7+
## Setting up a development installation
8+
In order to make changes to `DLC2Action`, you will need to [fork](https://guides.github.com/activities/forking/#fork) the
9+
[repository](https://github.com/amathislab/dlc2action).
10+
11+
If you are not familiar with `git`, we recommend reading up on [this guide](https://guides.github.com/introduction/git-handbook/#basic-git).
12+
13+
Here are guidelines for installing DLC2Action locally on your own computer, where you can make changes to the code!
14+
15+
> Note, before committing to DLC2Action, please be sure your code is formatted according to `black`. To learn more, see [`black`'s documentation](https://black.readthedocs.io/en/stable/).
16+
17+
Now, please make a [pull request](https://github.com/amathislab/DLC2Action/pull/new/) that includes both a **summary of and changes to**:
18+
19+
- How you modified the code and what new functionality it has.
20+
- DOCSTRING update for your change
21+
- A working example of how it works for users.
22+
- If it's a function that also can be used in downstream steps (i.e. could be plotted) we ask you (1) highlight this, and (2) ideally you provide that functionality as well.
23+
24+
**Review & Formatting:**
25+
26+
- Please run black on the code to conform to our Black code style (see more at https://pypi.org/project/black/).
27+
- Please assign a reviewer, typically @andybonnetto or @AlexEMG!
28+
29+
Thanks for your contributions!

Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM nvcr.io/nvidia/pytorch:24.11-py3
2+
3+
RUN mkdir -p /DLC2action
4+
COPY . /DLC2action
5+
WORKDIR /DLC2action
6+
7+
# Install required packages
8+
RUN apt update
9+
RUN apt install python3-pip -y
10+
RUN pip install -e .
11+
12+
RUN apt-get install ffmpeg libsm6 libxext6 -y
13+
RUN apt-get install -y git
14+
RUN apt-get install vim -y

LICENSE.yml

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2020-present by A. Mathis Group and contributors. All rights reserved.
1+
Copyright 2025-present by A. Mathis Group and contributors. All rights reserved.
22

33
This project and all its files are licensed under GNU AGPLv3 or later version. A copy is included in dlc2action/LICENSE.AGPL.
44

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
recursive-include dlc2action/config *.yaml
1+
recursive-include dlc2action/config *.yaml

0 commit comments

Comments
 (0)