Merge remote-tracking branch 'upstream/develop' into feature/gravy_va…

…let_integration * Fixed conflicts in addons/base/views.py, for details, see ENG-6310
CenterForOpenScience · Oct 3, 2024 · 784217c · 784217c
2 parents 8484057 + decc312
commit 784217c
Show file tree

Hide file tree

Showing 112 changed files with 3,547 additions and 2,448 deletions.
diff --git a/.github/actions/start-build/action.yml b/.github/actions/start-build/action.yml
@@ -27,8 +27,8 @@ runs:
   - name: Copy Settings
     shell: bash
     run: |
-      cp website/settings/local-travis.py website/settings/local.py
-      cp api/base/settings/local-travis.py api/base/settings/local.py
+      cp website/settings/local-ci.py website/settings/local.py
+      cp api/base/settings/local-ci.py api/base/settings/local.py
       mkdir -p ~/preprints
       touch ~/preprints/index.html
   - name: PIP install
@@ -41,7 +41,7 @@ runs:
     shell: bash
     run: |
       # bumped psycopg to match requirements.txt, as otherwise build would fail
-      poetry run python3 -m invoke travis-addon-settings
+      poetry run python3 -m invoke ci-addon-settings
       pip uninstall uritemplate.py --yes
       # use yarn add --exact to match versions in yarn.lock w/o installing all deps
       yarn add --exact bower@^1.8.8

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -39,7 +39,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -52,7 +52,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-travis-addons -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-addons -n 1 --junit
     - name: Upload report
       if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
@@ -66,7 +66,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -79,7 +79,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-travis-website -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-website -n 1 --junit
     - name: Upload report
       if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
@@ -93,7 +93,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -108,7 +108,7 @@ jobs:
       - name: NVM & yarn install
         run: poetry run python3 -m invoke assets --dev
       - name: Run test
-        run: poetry run python3 -m invoke test-travis-api1-and-js -n 1 --junit
+        run: poetry run python3 -m invoke test-ci-api1-and-js -n 1 --junit
       - name: Upload report
         if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
         uses: ./.github/actions/gen-report
@@ -122,7 +122,7 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -135,7 +135,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-travis-api2 -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-api2 -n 1 --junit
     - name: Upload report
       if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
@@ -150,7 +150,7 @@ jobs:
         image: postgres
 
         env:
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: ${{ env.OSF_DB_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -163,7 +163,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions/start-build
     - name: Run tests
-      run: poetry run python3 -m invoke test-travis-api3-and-osf -n 1 --junit
+      run: poetry run python3 -m invoke test-ci-api3-and-osf -n 1 --junit
     - name: Upload report
       if: (github.event_name != 'pull_request') && (success() || failure())    # run this step even if previous step failed
       uses: ./.github/actions/gen-report
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,25 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+24.07.0 (2024-09-19)
+====================
+
+- Preprints Affiliation Project BE Release
+
+24.06.0 (2024-09-12)
+====================
+
+- Fix duplicate notifications for contributor-add failures
+- Allow Read and Write contributors to view a project's draft registrations
+- Change how files for withdrawn registrations are surfaced in the API
+- Fix date displayed in citation for a registration
+- New API endpoint /users/me/draft_preprints/
+- Add button to admin to move preprint from initial to pending
+- Update language in notifications to indicate preprint resubmission
+- Fix Preprint emails so they are sent as expected
+- Fix ORCiD email by sending them after changes are committed to DB
+- Remove references of TravisCI
+
 24.05.0 (2024-07-22)
 ====================
 - Bump base python version from py3.6 to py3.12.