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.

Sign up for GitHub

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

Jump to bottom

Prepare for R #115

Merged
merged 93 commits into from
Nov 29, 2022
Merged

Prepare for R #115

merged 93 commits into from
Nov 29, 2022

Commits on Jan 13, 2022

  1. Fix Python version regex

    @timmens
    timmens committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    0765225 View commit details
    Browse the repository at this point in the history

  2. Update Python version in GHA

    @timmens
    timmens committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    d74d1d0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix-python-version-regex

    @hmgaudecker
    hmgaudecker committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    027d313 View commit details
    Browse the repository at this point in the history

  4. Fix a couple of version numbers.

    @hmgaudecker
    hmgaudecker committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    cf30391 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    9c76ead View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2022

  1. Update environment.yml

    @timmens
    timmens committed Jan 15, 2022
    Configuration menu
    Copy the full SHA
    1ddfe54 View commit details
    Browse the repository at this point in the history

  2. Return to pip:kaleido

    @timmens
    timmens committed Jan 15, 2022
    Configuration menu
    Copy the full SHA
    cd62463 View commit details
    Browse the repository at this point in the history

  3. Fix typo on PYTHONVERSION_REGEX

    @timmens
    timmens committed Jan 15, 2022
    Configuration menu
    Copy the full SHA
    d5586ef View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. Make sure paths are represented in the same way everywhere.

    @hmgaudecker
    hmgaudecker committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    2014745 View commit details
    Browse the repository at this point in the history

  2. Fix typo.

    @hmgaudecker
    hmgaudecker committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    2b4d51b View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2022

  1. Started from pytask-dev/cookiecutter-pytask-project and adjusted stru… 

    …cture.

Only kept Python example for the moment.
Untested, for sure nowhere near a working state.
    @hmgaudecker
    hmgaudecker committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    2bde0af View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2022

  1. Change paths so that compilation of tex-file is possible also from ed… 

    …itor.
    @hmgaudecker
    hmgaudecker committed Feb 7, 2022
    Configuration menu
    Copy the full SHA
    51c1568 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. Further harmonisation with cookiecutter-pytask-project.

    @hmgaudecker
    hmgaudecker committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    2082d9c View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2022

  1. Harmonize with cookiecutter-pytask test suite

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    e499d03 View commit details
    Browse the repository at this point in the history

  2. Update docs and remove mypy

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    9e1bdc7 View commit details
    Browse the repository at this point in the history

  3. Skip notebooks in codespell hook

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    23fa823 View commit details
    Browse the repository at this point in the history

  4. Update docs

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    af69d09 View commit details
    Browse the repository at this point in the history

  5. Delete old example code

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    fd5766a View commit details
    Browse the repository at this point in the history

  6. Add missing cookiecutter specifier

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    a7561d6 View commit details
    Browse the repository at this point in the history

  7. Update pre-commit errors from project

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    7a8d48a View commit details
    Browse the repository at this point in the history

  8. Remove interrogate hook

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    5a811e4 View commit details
    Browse the repository at this point in the history

  9. Remove CI html build

    @timmens
    timmens committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    ff6141c View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2022

  1. Make biber default

    @timmens
    timmens committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    2008d01 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #99 from OpenSourceEconomics/new-structure-tests 

    Harmonize test-suite with cookiecutter-pytask
    @timmens
    timmens committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    492223b View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Update continuous-integration-workflow.yml

    @timmens
    timmens committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    765a8a9 View commit details
    Browse the repository at this point in the history

  2. Update black version

    @timmens
    timmens committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    30d82fa View commit details
    Browse the repository at this point in the history

  3. Update .pre-commit-config.yaml

    @timmens
    timmens committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    f2d03af View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. New example for templates (#100)

    @timmens
    timmens committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    31f7006 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Fix latex tasks (#104)

    @timmens
    timmens committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    29bd6e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. Added r channel to environment.

    @carolinalvarez
    carolinalvarez committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    9ae8b42 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2022

  1. Added additional R dependencies.

    @carolinalvarez
    carolinalvarez committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    e25a39f View commit details
    Browse the repository at this point in the history

  2. Added R script which contains translated code for the file clean_data.py

    @carolinalvarez
    carolinalvarez committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    483b754 View commit details
    Browse the repository at this point in the history

  3. Added task that runs the R script for data cleaning. The json file op… 

    …ened by the script is automatically generated by pytask-r.
    @carolinalvarez
    carolinalvarez committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    49a619f View commit details
    Browse the repository at this point in the history

  4. Added empty R scripts that correspond to the Python files.

    @carolinalvarez
    carolinalvarez committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    86f6821 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2022

  1. Modified data cleaning and added model.r code.

    @carolinalvarez
    carolinalvarez committed May 1, 2022
    Configuration menu
    Copy the full SHA
    0c01c46 View commit details
    Browse the repository at this point in the history

  2. Added initial code for predict.r

    @carolinalvarez
    carolinalvarez committed May 1, 2022
    Configuration menu
    Copy the full SHA
    2c27907 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2022

  1. Documentation Updates (#102)

    @Maxie02
    Maxie02 committed May 11, 2022
    Configuration menu
    Copy the full SHA
    bb49149 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Move to MyST

    @timmens
    timmens committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    1a44016 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into new-structure

    @timmens
    timmens committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    1145355 View commit details
    Browse the repository at this point in the history

  3. Fix environments

    @timmens
    timmens committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    a5f2858 View commit details
    Browse the repository at this point in the history

  4. Fix GHA

    @timmens
    timmens committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    9106955 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. Fix Windows tests

    @timmens
    timmens committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    afa05f8 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Environment fix

    @timmens
    timmens committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    0ab3cf2 View commit details
    Browse the repository at this point in the history

  2. Environment fix

    @timmens
    timmens committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    6927278 View commit details
    Browse the repository at this point in the history

  3. Fix environment in tox.ini

    @timmens
    timmens committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    f0c1ed0 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. Add estimation table to paper.pdf

    @timmens
    timmens committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    704b8a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2022

  1. Merge branch 'new-structure' into translate-example-to-R

    @timmens
    timmens committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    0abba5e View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Update R examples

    @timmens
    timmens committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    c70ce78 View commit details
    Browse the repository at this point in the history

  2. Improve multi-language management

    @timmens
    timmens committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    00e8937 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. Merge branch 'master' into translate-example-to-R

    @timmens
    timmens committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    f923b9d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Merge branch 'master' into translate-example-to-R

    @timmens
    timmens committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    f550304 View commit details
    Browse the repository at this point in the history

  2. Move to different architecture

    @timmens
    timmens committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    7000f57 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Make it work

    @timmens
    timmens committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    eaac5c2 View commit details
    Browse the repository at this point in the history

  2. Use correct conda executable in test

    @timmens
    timmens committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    8d1d85b View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Remove R task-files

    @timmens
    timmens committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    828d078 View commit details
    Browse the repository at this point in the history

  2. Cosmetics.

    @hmgaudecker
    hmgaudecker committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    df0714c View commit details
    Browse the repository at this point in the history

  3. Based on branch 'translate-example-to-R', but delete all things R so … 

    …that merging that branch will serve as a template for adding other examples.
    @hmgaudecker
    hmgaudecker committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    a1bc962 View commit details
    Browse the repository at this point in the history

  4. Forgot to save, use elif for cookiecutter._is_ci where useful.

    @hmgaudecker
    hmgaudecker committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    aedb491 View commit details
    Browse the repository at this point in the history

  5. So cookiecutter does not like variables starting with an underscore...

    @hmgaudecker
    hmgaudecker committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    7f59b8d View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2022

  1. Reproduce DAG and other figures.

    @hmgaudecker
    hmgaudecker committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    596dd52 View commit details
    Browse the repository at this point in the history

  2. Run a test with all environments and one with Python only.

    @hmgaudecker
    hmgaudecker committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    20b4fd0 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. [pre-commit.ci] pre-commit autoupdate 

    updates:
- [github.com/asottile/pyupgrade: v2.37.1 → v3.2.2](asottile/pyupgrade@v2.37.1...v3.2.2)
- [github.com/asottile/reorder_python_imports: v3.8.1 → v3.9.0](asottile/reorder-python-imports@v3.8.1...v3.9.0)
- [github.com/psf/black: 22.6.0 → 22.10.0](psf/black@22.6.0...22.10.0)
- https://github.com/myint/docformatter → https://github.com/PyCQA/docformatter
- [github.com/PyCQA/docformatter: v1.3.1 → v1.5.0](PyCQA/docformatter@v1.3.1...v1.5.0)
- [github.com/PyCQA/flake8: 4.0.1 → 5.0.4](PyCQA/flake8@4.0.1...5.0.4)
- [github.com/executablebooks/mdformat: 0.7.14 → 0.7.16](executablebooks/mdformat@0.7.14...0.7.16)
- [github.com/executablebooks/mdformat: 0.7.14 → 0.7.16](executablebooks/mdformat@0.7.14...0.7.16)
- [github.com/codespell-project/codespell: v2.1.0 → v2.2.2](codespell-project/codespell@v2.1.0...v2.2.2)
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    0840c27 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

  1. Merge 'pre-commit-ci-update-config' into prepare_for_r

    @hmgaudecker
    hmgaudecker committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    59f4f30 View commit details
    Browse the repository at this point in the history

  2. Rename master -> main in README, docs.

    @hmgaudecker
    hmgaudecker committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    553e059 View commit details
    Browse the repository at this point in the history

  3. Remove test to check whether it is length of runtime causing failures.

    @hmgaudecker
    hmgaudecker committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    1d3e325 View commit details
    Browse the repository at this point in the history

  4. Comment out the other test.

    @hmgaudecker
    hmgaudecker committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    4544c74 View commit details
    Browse the repository at this point in the history

  5. Do not use conda-build in environment, add micromamba.

    @hmgaudecker
    hmgaudecker committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    661635f View commit details
    Browse the repository at this point in the history

  6. Seems like test failures were indeed due to long-running conda. 

    Go back to version with both tests.
    @hmgaudecker
    hmgaudecker committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    ae8e49c View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2022

  1. Speed-up testing

    @timmens
    timmens committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    ccc658b View commit details
    Browse the repository at this point in the history

  2. Delete pre-commit test and run all tests

    @timmens
    timmens committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    f1daba8 View commit details
    Browse the repository at this point in the history

  3. Test with pytest

    @timmens
    timmens committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    4678bba View commit details
    Browse the repository at this point in the history

  4. Micromamba

    @timmens
    timmens committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    7b91b61 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2022

  1. Don't use environment.yml in micromamba env creation

    @timmens
    timmens committed Nov 26, 2022
    Configuration menu
    Copy the full SHA
    83fd2e6 View commit details
    Browse the repository at this point in the history

  2. Provide environment-name to micromamba provision

    @timmens
    timmens committed Nov 26, 2022
    Configuration menu
    Copy the full SHA
    7a10001 View commit details
    Browse the repository at this point in the history

  3. Install mamba into environment

    @timmens
    timmens committed Nov 26, 2022
    Configuration menu
    Copy the full SHA
    3c1da08 View commit details
    Browse the repository at this point in the history

  4. Update tests

    @timmens
    timmens committed Nov 26, 2022
    Configuration menu
    Copy the full SHA
    0c0334a View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2022

  1. Trying to fix test failures (mamba-org/mamba#1993).

    @hmgaudecker
    hmgaudecker committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    912047a View commit details
    Browse the repository at this point in the history

  2. Use standard conda incubator

    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    1e8b27f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'prepare_for_r' of https://github.com/OpenSourceEconomic… 

    …s/econ-project-templates into prepare_for_r
    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    e300de7 View commit details
    Browse the repository at this point in the history

  4. Fix invalid workflow file

    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    ae3706f View commit details
    Browse the repository at this point in the history

  5. Remove parallelization of pytest

    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    216657c View commit details
    Browse the repository at this point in the history

  6. Fix codecov and add parallelization

    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    ac9bb6d View commit details
    Browse the repository at this point in the history

  7. Install pytest-xdist on runner

    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    e2c2e18 View commit details
    Browse the repository at this point in the history

  8. Don't run tests in parallel

    @timmens
    timmens committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    0c0ef6d View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] pre-commit autoupdate 

    updates:
- [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](pre-commit/pre-commit-hooks@v4.3.0...v4.4.0)
- [github.com/asottile/pyupgrade: v2.37.1 → v3.2.2](asottile/pyupgrade@v2.37.1...v3.2.2)
- [github.com/asottile/reorder_python_imports: v3.8.1 → v3.9.0](asottile/reorder-python-imports@v3.8.1...v3.9.0)
- [github.com/psf/black: 22.6.0 → 22.10.0](psf/black@22.6.0...22.10.0)
- https://github.com/myint/docformatter → https://github.com/PyCQA/docformatter
- [github.com/PyCQA/docformatter: v1.3.1 → v1.5.0](PyCQA/docformatter@v1.3.1...v1.5.0)
- [github.com/PyCQA/flake8: 4.0.1 → 6.0.0](PyCQA/flake8@4.0.1...6.0.0)
- [github.com/executablebooks/mdformat: 0.7.14 → 0.7.16](executablebooks/mdformat@0.7.14...0.7.16)
- [github.com/executablebooks/mdformat: 0.7.14 → 0.7.16](executablebooks/mdformat@0.7.14...0.7.16)
- [github.com/codespell-project/codespell: v2.1.0 → v2.2.2](codespell-project/codespell@v2.1.0...v2.2.2)
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    188ad35 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. Finish docs.

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    2ea20f3 View commit details
    Browse the repository at this point in the history

  2. Merge branch main into prepare_for_r

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    623e48b View commit details
    Browse the repository at this point in the history

  3. Remove remaining traces of RST.

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    22eca1a View commit details
    Browse the repository at this point in the history

  4. Seriously the last traces of rst.

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    18d3a15 View commit details
    Browse the repository at this point in the history

  5. Merge branch pre-commit-ci-update-config into prepare_for_r

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    126bf8f View commit details
    Browse the repository at this point in the history

  6. Typo, align pre-commit configuration of inner project with outer one.

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    ca85080 View commit details
    Browse the repository at this point in the history

  7. Remove mdformat due to complaints in tests.

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    f85a943 View commit details
    Browse the repository at this point in the history

  8. Codespell complaint.

    @hmgaudecker
    hmgaudecker committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    e0774d8 View commit details
    Browse the repository at this point in the history