Skip to content

Commit

Permalink
Merge branch 'master' into code-cov-neg-sampling
Browse files Browse the repository at this point in the history
  • Loading branch information
shhs29 authored Feb 6, 2023
2 parents 9f6717f + 769eaa9 commit e1858ed
Show file tree
Hide file tree
Showing 512 changed files with 18,598 additions and 8,792 deletions.
13 changes: 0 additions & 13 deletions .coveragerc

This file was deleted.

3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ transform:
utils:
- torch_geometric/utils/**/*

contrib:
- torch_geometric/contrib/**/*

graphgym:
- graphgym/**/*
- torch_geometric/graphgym/**/*
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/full_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install graphviz
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install graphviz
- name: Install main package
run: |
pip install -e .[full,test]
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@ on: # yamllint disable-line rule:truthy

jobs:

pyright:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup packages
uses: ./.github/actions/setup

- name: Install pyright
run: |
pip install pyright
- name: Run pyright
continue-on-error: true
run: |
pyright
pylint:
runs-on: ubuntu-latest

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
sed -i "s/name='torch_geometric'/name='pyg-nightly'/" setup.py
sed -i "s/$VERSION/$VERSION.dev$TODAY/" setup.py
sed -i "s/$VERSION/$VERSION.dev$TODAY/" torch_geometric/__init__.py
sed -i 's/name="torch_geometric"/name="pyg-nightly"/' pyproject.toml
sed -i "s/version=\"$VERSION\"/version=\"$VERSION.dev$TODAY\"/" pyproject.toml
- name: Build package
run: python setup.py sdist
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ coverage.xml
*.out
*.pt
*.onnx
examples/feature_importance.png
examples/*.png
examples/*.pdf

!torch_geometric/data/
!test/data/
13 changes: 10 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@ repos:
rev: v4.4.0
hooks:
- id: end-of-file-fixer
name: End-of-file fixer
- id: trailing-whitespace
name: Remove trailing whitespaces
- id: check-toml
name: Check toml
- id: check-yaml
name: Check yaml
exclude: |
(?x)^(
conda/pytorch-geometric/meta.yaml|
conda/pyg/meta.yaml
)$
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.28.0
rev: v1.29.0
hooks:
- id: yamllint
name: Lint yaml
args: [-c=.yamllint.yml]

- repo: https://github.com/regebro/pyroma
Expand All @@ -24,14 +30,15 @@ repos:
name: Check packaging
args: [--min=10, .]

- repo: https://github.com/pre-commit/mirrors-yapf
- repo: https://github.com/google/yapf
rev: v0.32.0
hooks:
- id: yapf
name: Format code
additional_dependencies: [toml]

- repo: https://github.com/pycqa/isort
rev: 5.11.1
rev: 5.12.0
hooks:
- id: isort
name: Sort imports
Expand Down
4 changes: 0 additions & 4 deletions .style.yapf

This file was deleted.

113 changes: 103 additions & 10 deletions CHANGELOG.md

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ If you are interested in contributing to PyG, your contributions will likely fal
1. You want to implement a new feature:
- In general, we accept any features as long as they fit the scope of this package. If you are unsure about this or need help on the design/implementation of your feature, post about it in an issue.
2. You want to fix a bug:
- Feel free to send a Pull Request any time you encounter a bug. Please provide a clear and concise description of what the bug was. If you are unsure about if this is a bug at all or how to fix, post about it in an issue.
- Feel free to send a Pull Request (PR) any time you encounter a bug. Please provide a clear and concise description of what the bug was. If you are unsure about if this is a bug at all or how to fix, post about it in an issue.

Once you finish implementing a feature or bug-fix, please send a Pull Request to https://github.com/pyg-team/pytorch_geometric.
Once you finish implementing a feature or bug-fix, please send a PR to https://github.com/pyg-team/pytorch_geometric.
Your PR will be merged after one or more rounds of reviews by the [pyg-team](https://github.com/pyg-team).
If your PR isn't merged anytime soon (*e.g.,* due to its large size, complexity or unavailability of reviewers), try moving your contribution to the [`torch_geometric.contrib`](https://pytorch-geometric.readthedocs.io/en/latest/modules/contrib.html) package.
[`torch_geometric.contrib`](https://pytorch-geometric.readthedocs.io/en/latest/modules/contrib.html) has less rigourous review requirements and might lead to your PR getting merged faster.

## Developing PyG

Expand Down Expand Up @@ -87,7 +90,7 @@ PyG uses [GitHub Actions](https://github.com/pyg-team/pytorch_geometric/actions)

Everytime you send a Pull Request, your commit will be built and checked against the PyG guidelines:

1. Ensure that your code is formatted correctly by testing against the styleguide of [`flake8`](https://github.com/PyCQA/flake8)://github.com/PyCQA/pycodestyle):
1. Ensure that your code is formatted correctly by testing against the styleguide of [`flake8`](https://github.com/PyCQA/flake8):

```bash
flake8 .
Expand Down
Loading

0 comments on commit e1858ed

Please sign in to comment.