Prepare for R

.github/workflows/continuous-integration-workflow.yml

@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - "*"
@@ -30,44 +30,30 @@ jobs:
       - uses: actions/checkout@v2
       - uses: r-lib/actions/setup-tinytex@v1
         if: runner.os != 'Windows'
-
-      - uses: conda-incubator/setup-miniconda@v2
+
+      - name: Setup miniconda
+        uses: conda-incubator/setup-miniconda@v2
         with:
-          auto-update-conda: true
-          channels: conda-forge,defaults
-          channel-priority: true
           python-version: ${{ matrix.python-version }}
-
-      - name: Install core dependencies.
+          mamba-version: "*"
+          channels: conda-forge, nodefaults
+
+      - name: Install test dependencies
         shell: bash -l {0}
-        run: conda install -c conda-forge tox-conda coverage
-
-      - name: Run end-to-end tests.
+        run: mamba install pip cookiecutter pytest pytest-cov
+        
+      - name: Install pytest-cookies
         shell: bash -l {0}
-        run: tox -e pytest -- tests -m end_to_end --cov=./ --cov-report=xml -n auto
-
-      - name: Upload coverage reports of end-to-end tests.
-        if: runner.os == 'Linux' && matrix.python-version == '3.11'
+        run: pip install git+https://github.com/andriihomiak/pytest-cookies.git@fix/quotes_in_user_config
+
+      - name: Run tests
         shell: bash -l {0}
-        run: bash <(curl -s https://codecov.io/bash) -F end_to_end -c
-
-  pre-commit:
-    name: Run pre-commit.
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.11
-
-      - name: Install dependencies
-        run: pip install tox
+        run: pytest tests --cov=hooks --cov=tests --cov-report=xml
+
+      - name: Upload coverage reports
+        if: runner.os == 'Linux' && matrix.python-version == '3.11'
+        uses: codecov/codecov-action@v3
 
-      - name: Run pre-commit
-        run: tox -e pre-commit
 
   docs:
     name: Run documentation.

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: ^(\.|{{cookiecutter\.project_slug}}/.+)
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
     -   id: check-added-large-files
         args: ['--maxkb=25']
@@ -32,25 +32,25 @@ repos:
     -   id: python-use-type-annotations
     -   id: text-unicode-replacement-char
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.1
+    rev: v3.2.2
     hooks:
     -   id: pyupgrade
         args: [--py37-plus]
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.8.1
+    rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.10.0
     hooks:
     -   id: black
--   repo: https://github.com/myint/docformatter
-    rev: v1.3.1
+-   repo: https://github.com/PyCQA/docformatter
+    rev: v1.5.0
     hooks:
     -   id: docformatter
         args: [--in-place, --wrap-summaries, "88", --wrap-descriptions, "88", --blank]
 -   repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
     -   id: flake8
         additional_dependencies: [
@@ -84,7 +84,7 @@ repos:
         ]
         pass_filenames: false
 -   repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.14
+    rev: 0.7.16
     hooks:
     -   id: mdformat
         additional_dependencies: [
@@ -94,7 +94,7 @@ repos:
         args: [--wrap, "88"]
         files: (README\.md)
 -   repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.14
+    rev: 0.7.16
     hooks:
     -   id: mdformat
         additional_dependencies: [
@@ -109,9 +109,10 @@ repos:
         #         path/to/file.py
         #     )$
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.2.2
     hooks:
     -   id: codespell
+        args: [--skip="**.ipynb"]
 -   repo: https://github.com/guilatrova/tryceratops
     rev: v1.1.0
     hooks:

README.md

@@ -4,8 +4,8 @@
 [![image](https://zenodo.org/badge/14557543.svg)](https://zenodo.org/badge/latestdoi/14557543)
 [![Documentation Status](https://readthedocs.org/projects/econ-project-templates/badge/?version=stable)](https://econ-project-templates.readthedocs.io/en/stable/)
 [![image](https://github.com/OpenSourceEconomics/econ-project-templates/actions/workflows/continuous-integration-workflow.yml/badge.svg)](https://github.com/OpenSourceEconomics/econ-project-templates/actions/workflows/continuous-integration-workflow.yml)
-[![image](https://codecov.io/gh/OpenSourceEconomics/econ-project-templates/branch/master/graph/badge.svg)](https://codecov.io/gh/OpenSourceEconomics/econ-project-templates)
-[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/OpenSourceEconomics/econ-project-templates/master.svg)](https://results.pre-commit.ci/latest/github/OpenSourceEconomics/econ-project-templates/master)
+[![image](https://codecov.io/gh/OpenSourceEconomics/econ-project-templates/branch/main/graph/badge.svg)](https://codecov.io/gh/OpenSourceEconomics/econ-project-templates)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/OpenSourceEconomics/econ-project-templates/main.svg)](https://results.pre-commit.ci/latest/github/OpenSourceEconomics/econ-project-templates/main)
 [![image](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 This project aims to provide project templates for economists that make it easy to
@@ -29,7 +29,7 @@ this is a small team so there is no need for a detailed formal process.
 
 ## Contributors
 
-@hmgaudecker @timmens @tobiasraabe
+@hmgaudecker @timmens @tobiasraabe @mj023
 
 ## Former Contributors
 

codecov.yml

@@ -9,20 +9,8 @@ coverage:
     project:
       default:
         threshold: 1%
-      unit:
-        threshold: 1%
-        flags:
-          - unit
-      integration:
-        threshold: 1%
-        flags:
-          - integration
-      end_to_end:
-        threshold: 1%
-        flags:
-          - end_to_end
 
 ignore:
-  - "{{cookiecutter.project_slug}}/**/*"
-  - ".tox/**/*"
+  - "{{cookiecutter.project_slug}}"
+  - ".tox"
   - "setup.py"

cookiecutter.json

@@ -8,59 +8,58 @@
   "github_username": "{{ cookiecutter.author.lower().replace(' ', '') }}",
   "github_email": "{{ cookiecutter.email }}",
   "git_remote_url": "",
-  "version": "0.0.1",
-  "python_version": "3.11",
-  "is_ci": ["no", "yes"],
-  "add_tox": [
+  "make_initial_commit": [
     "yes",
     "no"
   ],
-  "add_github_actions": [
-    "yes",
-    "no"
+  "version": "0.0.1",
+  "python_version": "3.11",
+  "conda_environment_name": "{{ cookiecutter.project_slug }}",
+  "create_conda_environment_at_finish": [
+    "no",
+    "yes"
   ],
-  "add_mypy": [
+  "add_python_example": [
     "yes",
     "no"
   ],
-  "add_codecov": [
+  "add_r_example": [
     "yes",
     "no"
   ],
-  "create_changelog": [
+  "add_julia_example": [
     "yes",
     "no"
   ],
-  "open_source_license": [
-    "MIT",
-    "BSD",
-    "ISC",
-    "Apache Software License 2.0",
-    "GNU General Public License v3",
-    "Not open source"
-  ],
-  "make_initial_commit": [
+  "add_stata_example": [
     "yes",
     "no"
   ],
-  "add_python_example": [
+  "add_tox": [
     "yes",
     "no"
   ],
-  "add_julia_example": [
+  "add_github_actions": [
     "yes",
     "no"
   ],
-  "add_r_example": [
+  "add_codecov": [
     "yes",
     "no"
   ],
-  "add_stata_example": [
+  "create_changelog": [
     "yes",
     "no"
   ],
-  "conda_environment_name": "{{ cookiecutter.project_slug }}",
-  "create_conda_environment_at_finish": [
+  "open_source_license": [
+    "MIT",
+    "BSD",
+    "ISC",
+    "Apache Software License 2.0",
+    "GNU General Public License v3",
+    "Not open source"
+  ],
+  "is_ci": [
     "no",
     "yes"
   ],