Skip to content

Commit

Permalink
Merge branch 'cookiecutter' into new_scattering_freefield
Browse files Browse the repository at this point in the history
  • Loading branch information
ahms5 committed Feb 20, 2024
2 parents 4f98a5b + 723c48c commit ffaad46
Show file tree
Hide file tree
Showing 26 changed files with 326 additions and 332 deletions.
115 changes: 62 additions & 53 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,32 +66,34 @@ jobs:
pip-dependency-file: requirements_dev.txt
- run:
name: Flake8
command: flake8 imkar

# test_examples:
# parameters:
# version:
# description: "version tag"
# default: "latest"
# type: string
# executor:
# name: python-docker
# version: <<parameters.version>>

# steps:
# - checkout
# # - run:
# # name: Install System Dependencies
# # command: sudo apt-get update && sudo apt-get install -y libsndfile1
# - python/install-packages:
# pkg-manager: pip
# # app-dir: ~/project/package-directory/ # If you're requirements.txt isn't in the root directory.
# pip-dependency-file: requirements_dev.txt
# - run:
# name: Examples
# command: |
# pip install -e .
# pytest --nbmake examples/*.ipynb
command: flake8 imkar tests


test_documentation_build:
parameters:
version:
description: "version tag"
default: "latest"
type: string
executor:
name: python-docker
version: <<parameters.version>>

steps:
- checkout
# - run:
# name: Install System Dependencies
# command: sudo apt-get update && sudo apt-get install -y libsndfile1 texlive-latex-extra dvipng
- python/install-packages:
pkg-manager: pip
# app-dir: ~/project/package-directory/ # If you're requirements.txt isn't in the root directory.
pip-dependency-file: requirements_dev.txt
- run:
name: Sphinx
command: |
pip install -e .
cd docs/
make html SPHINXOPTS="-W"
test_pypi_publish:
parameters:
Expand Down Expand Up @@ -128,9 +130,12 @@ workflows:
matrix:
parameters:
version:
- "3.8"
- "3.9"
- "3.10"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"

- flake:
matrix:
parameters:
Expand All @@ -139,13 +144,14 @@ workflows:
requires:
- build_and_test

# - test_examples:
# matrix:
# parameters:
# version:
# - "3.9"
# requires:
# - build_and_test

- test_documentation_build:
matrix:
parameters:
version:
- "3.9"
requires:
- build_and_test


test_and_publish:
Expand All @@ -156,9 +162,12 @@ test_and_publish:
matrix:
parameters:
version:
- "3.8"
- "3.9"
- "3.10"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"

filters:
branches:
ignore: /.*/
Expand All @@ -180,19 +189,19 @@ test_and_publish:
tags:
only: /^v[0-9]+(\.[0-9]+)*$/

# - test_examples:
# matrix:
# parameters:
# version:
# - "3.9"
# requires:
# - build_and_test
# filters:
# branches:
# ignore: /.*/
# # only act on version tags
# tags:
# only: /^v[0-9]+(\.[0-9]+)*$/
- test_documentation_build:
matrix:
parameters:
version:
- "3.9"
requires:
- build_and_test
filters:
branches:
ignore: /.*/
# only act on version tags
tags:
only: /^v[0-9]+(\.[0-9]+)*$/

- test_pypi_publish:
matrix:
Expand All @@ -202,7 +211,7 @@ test_and_publish:
requires:
- build_and_test
- flake
# - test_examples
- test_documentation_build
filters:
branches:
ignore: /.*/
Expand Down
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ insert_final_newline = true
charset = utf-8
end_of_line = lf

[*.yml]
indent_size = 2

[*.bat]
indent_style = tab
end_of_line = crlf
Expand Down
19 changes: 5 additions & 14 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
## General

* imkar version:
* Python version:
* Operating System:
* Did you install pyfar via pip:

### Description
## Description

Describe what you were trying to get done.
Tell us what happened, what went wrong, and what you expected to happen.

### What I Did
## What I Did

```
Paste the command(s) you ran and the output.
If there was a crash, please include the traceback here.
```

## Labels

Label your issue to make it easier for us to assign and track:

Use one of these labels:
- **hot:** For bugs on the master branch
- **bug:** For bugs not on the master branch
- **enhancement:** For suggesting enhancements of current functionality
- **feature:** For requesting new features
- **documentation:** Everything related to docstrings and comments
- **question:** General questions, e.g., regarding the general structure or future directions
11 changes: 0 additions & 11 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,3 @@ Closes #
-
-
-

### Labels

Label your issue to make it easier for us to assign and track:

Use one of these labels:
- **hot:** For bugs on the master branch
- **bug:** For bugs not on the master branch
- **enhancement:** For suggesting enhancements of current functionality
- **feature:** For requesting new features
- **documentation:** Everything related to docstrings and comments
22 changes: 16 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ __pycache__/

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
Expand All @@ -24,6 +23,7 @@ wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
Expand All @@ -37,7 +37,6 @@ pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
Expand All @@ -54,6 +53,7 @@ coverage.xml
# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
Expand All @@ -64,12 +64,14 @@ instance/

# Sphinx documentation
docs/_build/
docs/_autosummary

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints
*/.ipynb_checkpoints/*

# pyenv
.python-version
Expand All @@ -80,13 +82,14 @@ celerybeat-schedule
# SageMath parsed files
*.sage.py

# dotenv
# Environments
.env

# virtualenv
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
Expand All @@ -101,6 +104,13 @@ ENV/
# mypy
.mypy_cache/

# IDE settings
# vs code
.vscode/
.idea/

# macOS
.DS_Store

# workaround for failing test discovery in vscode
tests/*/__init__.py
tests/private/
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build:
os: ubuntu-22.04
tools:
python: "3.10"
apt_packages:
- libsndfile1
# apt_packages:
# - libsndfile1

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
Loading

0 comments on commit ffaad46

Please sign in to comment.