Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delete .editorconfig #229

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4b0229b
enable lfs for github action checkout
CunliangGeng Mar 13, 2024
055426d
update github action checkout to v4
CunliangGeng Mar 13, 2024
18a382a
exclude tests for the distribution
CunliangGeng Mar 13, 2024
4548608
fix the bug on removing pycache from subfolders
CunliangGeng Mar 13, 2024
7427130
fix github actions for parallel testing
CunliangGeng Mar 13, 2024
95d628b
fix failed tests caused by the new version of jsonschema
CunliangGeng Mar 13, 2024
9a3db87
move integration tests to subfolder `integration`
CunliangGeng Mar 14, 2024
65ea372
move unit tests to subfolder `unit`
CunliangGeng Mar 14, 2024
5abcef7
fix import error
CunliangGeng Mar 14, 2024
84eb87e
update unit conftest.py
CunliangGeng Mar 14, 2024
7c9238b
Update pyproject.toml
CunliangGeng Mar 14, 2024
7cc79ef
fix bug on checking gnps website status
CunliangGeng Mar 15, 2024
3f2ccef
use pytest hook to create and remove temp dir
CunliangGeng Mar 15, 2024
f858a76
Delete local_mode_example.zip
CunliangGeng Mar 18, 2024
8fe4fbb
use pytest hook for integration tests
CunliangGeng Mar 18, 2024
25abf22
stop using git lfs
CunliangGeng Mar 18, 2024
34351e8
remove lfs download from github action
CunliangGeng Mar 18, 2024
4f79120
Update .gitignore
CunliangGeng Mar 18, 2024
66deb90
restore files from lfs
CunliangGeng Mar 18, 2024
736ec43
Update tests/integration/conftest.py
CunliangGeng Mar 21, 2024
e9c7685
fix typo
CunliangGeng Mar 21, 2024
2639fd7
fix typo
CunliangGeng Mar 21, 2024
b1b9feb
remove unused dependencies and add required ones
CunliangGeng Mar 18, 2024
7d9a13b
only use `Self` when checking static typing
CunliangGeng Mar 18, 2024
a38ecc4
fix typing error in python v3.9
CunliangGeng Mar 18, 2024
5c1a557
fix bug on checking gnps website status
CunliangGeng Mar 18, 2024
90075ff
run building and type check actions for PRs on all branches
CunliangGeng Mar 18, 2024
6f9fb3a
Delete documentation.yml
CunliangGeng Mar 18, 2024
1a1700a
separate building and sonarcloud actions
CunliangGeng Mar 18, 2024
c93d205
Update pyproject.toml
CunliangGeng Mar 18, 2024
c889e6b
Update project_setup.md
CunliangGeng Mar 18, 2024
542d50b
Delete 03_readthedocs.md
CunliangGeng Mar 18, 2024
7d2d24a
Update README.dev.md
CunliangGeng Mar 18, 2024
7e7a966
Update README.md
CunliangGeng Mar 18, 2024
9e6a530
Update install-nplinker-deps
CunliangGeng Mar 18, 2024
0245274
delete .editorconfig
CunliangGeng Mar 20, 2024
ff87b11
delete settings.json
CunliangGeng Mar 18, 2024
6bc2454
Update mkdocs.yml
CunliangGeng Mar 18, 2024
3e141b9
Update index.md
CunliangGeng Mar 18, 2024
22a888b
Create install.md
CunliangGeng Mar 18, 2024
c701aa4
create quickstart.md
CunliangGeng Mar 19, 2024
377b5aa
create gnps_data.md
CunliangGeng Mar 19, 2024
5a0701c
create working_dir_structure.md
CunliangGeng Mar 19, 2024
33aba32
Update working_dir_structure.md
CunliangGeng Mar 20, 2024
26e8099
Update quickstart.md
CunliangGeng Mar 20, 2024
8b0764a
Update quickstart.md
CunliangGeng Mar 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@
*.sh text
*.bat text
*.toml text
*.zip filter=lfs diff=lfs merge=lfs -text
20 changes: 0 additions & 20 deletions .github/next_steps/03_readthedocs.md

This file was deleted.

47 changes: 4 additions & 43 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on:
- setup.py
- .github/workflows/build.yml
pull_request:
branches:
- main
- dev
paths:
- bin/**
- src/**
Expand All @@ -34,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
Expand All @@ -47,7 +44,7 @@ jobs:
- name: Upgrade pip and install dependencies
run: |
python3 -m pip install --upgrade pip setuptools
pip install build pytest wheel
pip install build pytest wheel pytest-xdist
- name: Build the package
run: python -m build
- name: Install nplinker
Expand All @@ -67,7 +64,7 @@ jobs:
os: ['ubuntu-latest']
python-version: ['3.9', '3.11']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
Expand All @@ -80,7 +77,7 @@ jobs:
- name: Upgrade pip and install dependencies
run: |
python3 -m pip install --upgrade pip setuptools
pip install build pytest wheel
pip install build pytest wheel pytest-xdist
- name: Build the package
run: python -m build
- name: Install nplinker
Expand All @@ -89,39 +86,3 @@ jobs:
install-nplinker-deps --run-on-github
- name: Run unit tests
run: pytest -v

sonarcloud:
name: SonarCloud
needs: smoke_test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.10'
- name: Python info
shell: bash -l {0}
run: |
which python3
python3 --version
- name: Upgrade pip and setuptools
run: |
python3 -m pip install --upgrade pip setuptools wheel
- name: Install nplinker and its dependencies
run: |
python3 -m pip install .[dev]
install-nplinker-deps --run-on-github
- name: Check style against standards using ruff
run: ruff .
- name: Run unit tests with coverage
run: pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml tests/
- name: Correct coverage paths
run: sed -i "s+$PWD/++g" coverage.xml
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{secrets.SONAR_TOKEN }}
40 changes: 0 additions & 40 deletions .github/workflows/documentation.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish_gh_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ inputs.current_version != inputs.new_version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_to_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4
- uses: actions/setup-python@v3
with:
python-version: '3.x'
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/sonar-cloud.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Check format and coverage, then upload to SonarCloud

on:
push:
branches:
- main
- dev
paths:
- bin/**
- src/**
- tests/**
- setup.py
- .github/workflows/build.yml
pull_request:
branches:
- main
- dev
paths:
- bin/**
- src/**
- tests/**
- setup.py
- .github/workflows/build.yml
types:
- opened
- reopened
- synchronize
- ready_for_review

jobs:

sonarcloud:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.10'
- name: Python info
shell: bash -l {0}
run: |
which python3
python3 --version
- name: Upgrade pip and setuptools
run: |
python3 -m pip install --upgrade pip setuptools wheel
- name: Install nplinker and its dependencies
run: |
python3 -m pip install .[dev]
install-nplinker-deps --run-on-github
- name: Check style against standards using ruff
run: ruff check .
- name: Run unit tests with coverage
run: pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml tests/unit
- name: Correct coverage paths
run: sed -i "s+$PWD/++g" coverage.xml
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{secrets.SONAR_TOKEN }}
5 changes: 1 addition & 4 deletions .github/workflows/typing-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
- src/**
- tests/**
pull_request:
branches:
- main
- dev
paths:
- src/**
- tests/**
Expand All @@ -21,7 +18,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ tags
webapp/npapp/static/css/bokeh*.css
webapp/npapp/static/js/bokeh*.js
src/nplinker/scoring/iokr/data/SPEC/
tests/integration/data/nplinker_local_mode_example.zip
25 changes: 0 additions & 25 deletions .vscode/settings.json

This file was deleted.

1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include LICENSE
include NOTICE
include requirements.txt
include requirements.dev.txt
prune tests
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
find . -name '__pycache__' -exec rm -fr {} +
find . -name '*__pycache__' -exec rm -fr {} +
find . -name '*_cache' -exec rm -fr {} +

clean-test:
Expand Down
Loading