Skip to content

Commit

Permalink
Revert "Migrate v2 branch to develop (#3102)"
Browse files Browse the repository at this point in the history
This reverts commit 76f2313.
  • Loading branch information
yunchu authored Mar 15, 2024
1 parent 76f2313 commit bbcafbf
Show file tree
Hide file tree
Showing 3,283 changed files with 243,285 additions and 71,634 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .ci/piptools-deps.in

This file was deleted.

45 changes: 0 additions & 45 deletions .ci/piptools-deps.txt

This file was deleted.

2 changes: 0 additions & 2 deletions .ci/publish-deps.in

This file was deleted.

320 changes: 0 additions & 320 deletions .ci/publish-deps.txt

This file was deleted.

1 change: 0 additions & 1 deletion .ci/tox-deps.in

This file was deleted.

62 changes: 0 additions & 62 deletions .ci/tox-deps.txt

This file was deleted.

22 changes: 15 additions & 7 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
*
!src/otx
!pyproject.toml
!README.md
!LICENSE
!MANIFEST.in
!docker/download_pretrained_weights.py
**/venv/**
.git
.github
.mypy_cache
.pytest_cache
.tox
.vscode
__pycache__
build/
data/
docs/
lightning_logs/
misc/
results/
venv/
5 changes: 5 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[flake8]
extend-ignore = E203
exclude = .venv
max-complexity = 6
max-line-length = 120
4 changes: 0 additions & 4 deletions .github/CODEOWNERS

This file was deleted.

File renamed without changes.
26 changes: 0 additions & 26 deletions .github/dependabot.yaml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: 2
updates:
- package-ecosystem: docker
directory: /.ci
schedule:
interval: weekly

- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly

- package-ecosystem: docker
directory: /docker
schedule:
interval: weekly

- package-ecosystem: pip
directory: /src/otx/api/usecases/exportable_code/demo
schedule:
interval: weekly

- package-ecosystem: pip
directory: /requirements
schedule:
interval: weekly

- package-ecosystem: pip
directory: /docker
schedule:
interval: weekly
15 changes: 11 additions & 4 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
# See help here: https://github.com/marketplace/actions/labeler

OTX 2.0:
- "src/otx/**/*"
CLI:
- "src/otx/cli/**/*"
API:
- "src/otx/api/**/*"
ALGO:
- "src/otx/algorithms/**/*"
TEST:
- "tests/**/*"
DOC:
- "docs/**/*"
- "**/*.md"
- "LICENSE"
- "third-party-programs.txt"
- "NOTICE"
- "for_developers/**/*"
BUILD:
- ".ci/**/*"
- ".github/**/*"
- ".flake8"
- ".isort.cfg"
- ".mdlrc"
- ".pre-commit-config.yaml"
- "markdownlint.rb"
- "setup.py"
- "pyproject.toml"
- "tox.ini"
- "MANIFEST.in"
DEPENDENCY:
- "requirements/*"
- "setup.py"
- "pyproject.toml"
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ not fully covered by unit tests or manual testing can be complicated. -->
- [ ] I have updated the license header for each file (see an example below).

```python
# Copyright (C) 2024 Intel Corporation
# Copyright (C) 2023 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
```
58 changes: 0 additions & 58 deletions .github/workflows/code_scan.yaml

This file was deleted.

66 changes: 66 additions & 0 deletions .github/workflows/code_scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Code Scanning

on:
workflow_dispatch: # run on request (no need for PR)
push:
branches:
- "releases/*"
- "v2"
schedule:
# every UTC 6PM from Mon to Fri
- cron: "0 18 * * 1-5"

# Declare default permissions as read only.
permissions: read-all

jobs:
Trivy-scan:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Python
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
python-version: "3.10"
- name: Install dependencies
run: |
pip install --require-hashes --no-deps -r requirements/gh-actions.txt
pip-compile --generate-hashes -o /tmp/otx-dev-requirements.txt requirements/dev.txt
pip install --require-hashes --no-deps -r /tmp/otx-dev-requirements.txt
- name: Trivy Scanning
env:
TRIVY_DOWNLOAD_URL: ${{ vars.TRIVY_DOWNLOAD_URL }}
run: tox -vv -e trivy-scan
- name: Upload Trivy results artifact
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: trivy-results
path: |
.tox/trivy-spdx-otx.json
.tox/trivy-results-otx.txt
.tox/trivy-results-otx.csv
Bandit:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Python
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
python-version: "3.10"
- name: Install dependencies
run: |
pip install --require-hashes --no-deps -r requirements/gh-actions.txt
pip-compile --generate-hashes -o /tmp/otx-dev-requirements.txt requirements/dev.txt
pip install --require-hashes --no-deps -r /tmp/otx-dev-requirements.txt
rm /tmp/otx-dev-requirements.txt
- name: Bandit Scanning
run: tox -e bandit-scan
- name: Upload Bandit artifact
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: bandit-report
path: .tox/bandit-report.txt
# Use always() to always run this step to publish scan results when there are test failures
if: ${{ always() }}
Loading

0 comments on commit bbcafbf

Please sign in to comment.