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

Refactor Docker image and package builds #1183

Merged
merged 46 commits into from
Sep 22, 2024
Merged

Refactor Docker image and package builds #1183

merged 46 commits into from
Sep 22, 2024

Commits on Sep 13, 2024

  1. WIP basic conda image from jupyter/docker-stacks-foundation

    @ethho
    ethho committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    6256eda View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Merge branch 'master' into migrate-pyproject

    @ethho
    ethho committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    677a8b5 View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary files for build

    @ethho
    ethho committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    2d083bb View commit details
    Browse the repository at this point in the history

  3. Basic pyproject.toml from poetry init

    @ethho
    ethho committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    65fb4d4 View commit details
    Browse the repository at this point in the history

  4. Basic pyproject.toml from python.org 

    https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#a-full-example
    @ethho
    ethho committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    0c297ff View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. First pass pyproject.toml

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    77cf1c6 View commit details
    Browse the repository at this point in the history

  2. rm setup.py

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    65446a7 View commit details
    Browse the repository at this point in the history

  3. Clean up Docker compose

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    bbf3957 View commit details
    Browse the repository at this point in the history

  4. Move LNX-*.yml to docker-compose.yaml 

    Standard file name
    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    f1b065e View commit details
    Browse the repository at this point in the history

  5. Minimal Dockerfile

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7663e67 View commit details
    Browse the repository at this point in the history

  6. Deprecate datajoint.plugin and otumat

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    f8b02dd View commit details
    Browse the repository at this point in the history

  7. docker compose runs pytests

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4cdfe4f View commit details
    Browse the repository at this point in the history

  8. Revert to using datajoint.plugin

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b08150a View commit details
    Browse the repository at this point in the history

  9. Revert to using otumat and datajoint.pub

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    04b9048 View commit details
    Browse the repository at this point in the history

  10. Many changes to CI/CD

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7768497 View commit details
    Browse the repository at this point in the history

  11. Separate djtest service

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    e6d034d View commit details
    Browse the repository at this point in the history

  12. Deprecate fakeservices.datajoint.io in testing

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b8efb1d View commit details
    Browse the repository at this point in the history

  13. Install graphviz and pydot via conda in container

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b53f688 View commit details
    Browse the repository at this point in the history

  14. Install git in conda env

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    394b19f View commit details
    Browse the repository at this point in the history

  15. Fix or skip failing tests

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    7b269ca View commit details
    Browse the repository at this point in the history

  16. Use build instead of setup.py in CI

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    5fd8371 View commit details
    Browse the repository at this point in the history

  17. Remove duplicate syntax tests from CI

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    eefcbd8 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into docker-img-refactor

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4ee287c View commit details
    Browse the repository at this point in the history

  19. Fix perms in container install and volumes

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    91693eb View commit details
    Browse the repository at this point in the history

  20. Quiet docker pull in CI

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    e3d84ef View commit details
    Browse the repository at this point in the history

  21. Format with black==24.8.0

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    d3b7592 View commit details
    Browse the repository at this point in the history

  22. Set user in docker-compose

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    764ae93 View commit details
    Browse the repository at this point in the history

  23. Try mambaorg/micromamba base image

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    26050ca View commit details
    Browse the repository at this point in the history

  24. Use micromamba run instead of activate during build

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    850ae19 View commit details
    Browse the repository at this point in the history

  25. Skip minio client fixture teardown by default

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    426f62d View commit details
    Browse the repository at this point in the history

  26. yield minio client properly

    @ethho
    ethho committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0812fe1 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Use datajoint/_version.py written by setuptools_scm

    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    fc5a27f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'docker-img-refactor' into migrate-pyproject

    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    16e4347 View commit details
    Browse the repository at this point in the history

  3. Parse DJ_VERSION from pyproject.toml

    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9dbc10e View commit details
    Browse the repository at this point in the history

  4. Revert "Parse DJ_VERSION from pyproject.toml" 

    This reverts commit 9dbc10e.
    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    375e083 View commit details
    Browse the repository at this point in the history

  5. Deprecate setuptools_scm

    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    fd464c1 View commit details
    Browse the repository at this point in the history

  6. Checkout datajoint/version.py from 0812fe1

    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    fa34535 View commit details
    Browse the repository at this point in the history

  7. Clean up

    @ethho
    ethho committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9884672 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1187 from datajoint/migrate-pyproject 

    Replace setup.py with pyproject.toml
    @ethho
    ethho authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    c831797 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Include test deps in dev container

    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    bad072b View commit details
    Browse the repository at this point in the history

  2. Remove references to fakeservices.datajoint.io

    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0199889 View commit details
    Browse the repository at this point in the history

  3. Quiet postStartup command

    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e117e38 View commit details
    Browse the repository at this point in the history

  4. Update developer documentation

    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    894e538 View commit details
    Browse the repository at this point in the history

  5. Prepare for 0.14.3 release

    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    dd8661b View commit details
    Browse the repository at this point in the history

  6. Remove old Docker build file

    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    172f256 View commit details
    Browse the repository at this point in the history

  7. Test Python 3.12 in CI 

    Fixes #1165
    @ethho
    ethho committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    618a8d5 View commit details
    Browse the repository at this point in the history