Skip to content

Commit

Permalink
Merge branch 'Release/v0.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
joroeder committed Apr 19, 2023
2 parents 9449bac + e72cfa7 commit ace84e2
Show file tree
Hide file tree
Showing 113 changed files with 2,482 additions and 1,288 deletions.
16 changes: 16 additions & 0 deletions .coveragerc
@@ -0,0 +1,16 @@
[paths]
source = dhnx

[run]
branch = true
source =
dhnx
tests
parallel = true
omit = *custom*
*test*

[report]
show_missing = true
precision = 2
omit = *migrations*
6 changes: 0 additions & 6 deletions .flake8

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS, Debian, Ubunut, Windows10]
- Python version [e.g. 3.8]

**Additional context**
Add any other context about the problem here.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/general-issue.md
@@ -0,0 +1,10 @@
---
name: General issue
about: General purpose
title: ''
labels: ''
assignees: ''

---


13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
* Describe your pull request as transparent as possible
* What functionality does it implement?
* Where is it located?
* How does the API look?
...

* Related issues?

* Share your knowledge: Insights/Remarks

* Other comments and questions

* [] For new features: Remember the documentation!
39 changes: 39 additions & 0 deletions .github/workflows/lint.yml
@@ -0,0 +1,39 @@
name: Falke8

on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev

jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: Install Python dependencies
run: pip install flake8

- name: Run linters
uses: samuelmeuli/lint-action@v1
with:
github_token: ${{ secrets.github_token }}
# Enable linters
flake8: true
# Mark the following line true if you want linters to attempt to autocorrect your code
auto_fix: false
git_name: "Greene Lab Linter"
git_email: "csgreene@upenn.edu"
37 changes: 37 additions & 0 deletions .github/workflows/packaging.yml
@@ -0,0 +1,37 @@
name: packaging

on:
# Make sure packaging process is not broken
push:
branches: [master, dev]
pull_request:
# Make a package for release
release:
types: [published]

jobs:
build:

runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.8, "3.10"]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools setuptools_scm twine wheel
- name: Create packages
run: python setup.py sdist bdist_wheel
- name: Run twine check
run: twine check dist/*
- uses: actions/upload-artifact@v2
with:
name: tox-gh-actions-dist
path: dist
54 changes: 54 additions & 0 deletions .github/workflows/tox_checks.yml
@@ -0,0 +1,54 @@
# NB: this name is used in the status badge
name: tox checks

on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev
workflow_dispatch:
schedule:
- cron: "0 5 * * 6" # 5:00 UTC every Saturday

jobs:
lint:
name: ${{ matrix.toxenv }}
runs-on: ubuntu-latest

strategy:
matrix:
toxenv:
- clean
- check
- docs

steps:
- name: Git clone
uses: actions/checkout@v2

- name: Set up Python ${{ env.default_python || '3.8' }}
uses: actions/setup-python@v2
with:
python-version: "${{ env.default_python || '3.8' }}"

- name: Pip cache
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'setup.py') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.toxenv }}-
${{ runner.os }}-pip-
- name: Install dependencies
run: |
python -m pip install -U pip
python -m pip install -U setuptools wheel
python -m pip install -U tox
- name: Run ${{ matrix.toxenv }}
run: python -m tox -e ${{ matrix.toxenv }}
36 changes: 36 additions & 0 deletions .github/workflows/tox_pytests.yml
@@ -0,0 +1,36 @@
name: tox pytests

on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev
workflow_dispatch:
schedule:
- cron: "0 5 * * 6" # 5:00 UTC every Saturday

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, "3.10"]

steps:
- uses: actions/checkout@v1
- name: Install cbc
run: sudo apt install coinor-cbc
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox tox-gh-actions coverage coveralls
- name: Test with tox
run: tox
57 changes: 52 additions & 5 deletions .gitignore
@@ -1,11 +1,58 @@
*.py[cod]
__pycache__

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
.eggs
parts
bin
var
sdist
wheelhouse
develop-eggs
.installed.cfg
lib
lib64
venv*/
pyvenv*/
pip-wheel-metadata/

# Installer logs
pip-log.txt

*.pyc
*.png
*.egg-info
*.html
.idea
results/
_build
jupyter_notebooks
*/import_export_plot/data_csv_output/
*/import_osmnx/data/
cache/

# Unit test / coverage reports
.coverage
.tox
.coverage.*
.pytest_cache/
nosetests.xml
coverage.xml
htmlcov

# Mr Developer
.mr.developer.cfg
.project
.pydevproject
.idea
*.iml
*.komodoproject

# examples
examples/import_export_plot/data_csv_output/*
examples/import_osmnx/osm_network/*
examples/simulation/tree_results/*
*cache*

0 comments on commit ace84e2

Please sign in to comment.