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.

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

[CR][ENG-5997] merge develop into b-and-i branch #10691

Commits on Jul 11, 2024

  1. Merge branch 'hotfix/24.04.3'

    mfraezz committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    84bc6c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. [CR][ENG-5681] Great Big Python Upgrade (CenterForOpenScience#10648)

    - Bump base python version from py3.6 to py3.12.
    - Switch to using poetry for dependency management
    - Bump most (not all) dependencies to their maximum version as of mid-March.
    - Significantly update Dockerfile
    - Upgrade Django to v4.2
    - Generate test summary reports in CI
    
    ---------
    
    Co-authored-by: Oleh Paduchak <[email protected]>
    Co-authored-by: Mariia Lychko <[email protected]>
    Co-authored-by: Longze Chen <[email protected]>
    4 people authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    8cb3723 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c703b0a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    63d7b8b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1c677a0 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. update dataverse dep revision to get changes

     * There were a bunch of changes made to the dataverse python module
       to get it working with the upgraded OSF. Then we ignored
       them. Avenge this injustice!
    
     * Rerunning `poetry lock` pulled in a new major version of indirect
       dep `django-datetime-field`. Pin the old version, b/c that seems
       like it could be break-y.
    
     * Update OSF version declare in pyproject.toml
    
     * Regenerate lockfile. Please setuptools, don't hurt 'em!
    felliott committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    fa23519 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'hotfix/24.05.1'

    mfraezz committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    bdce57b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a24ec14 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. correct body location for api.ia POST requests

     [ENG-6021]
    felliott committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f105587 View commit details
    Browse the repository at this point in the history
  2. update reqs to pull from github commit shas

     * Update repository-based deps (those that pull from github.com) to
       use commitShas instead of branch names. Update in both
       pyproject.toml (for poetry) and *requirements.txt (for legacy
       installs).
    felliott committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    7541bc5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b29530f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7289981 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. use correct version of module for metrics

     * Update metrics reports to import `elasticsearch6_dsl` instead of
       `elasticsearch_dsl`. `django-elasticsearch-metrics` was updated to
       use the ESv6-pinned version of elasticsearch_dsl. Our code was
       using the `InnerDocs` class from the v8 version of es_dsl and
       expecting it to work with the v6 version of ALL THE OTHER CLASSES
       in es_dsl. Stop doing that!
    
     * Fun fact: sometimes making a big dumb error will succeed
       incorrectly instead of throwing an error. Existence is a burden.
    
     * BTW this makes the admin metrics report return *all* the data, not
       just *some* of the data.
    felliott committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    68a970a View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Configuration menu
    Copy the full SHA
    dc84403 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Merge remote-tracking branch 'cos/develop' into feature/merge-develop…

    …-into-b-and-i
    
     * Merge in develop, which includes changes from the python 3.12
       upgrade
    felliott committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    9d23caa View commit details
    Browse the repository at this point in the history