forked from CenterForOpenScience/osf.io
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io
into remove-quickfiles-code * 'develop' of https://github.com/CenterForOpenScience/osf.io: (166 commits) update dataverse dep revision to get changes Update CHANGELOG, bump version [CR][ENG-5681] Great Big Python Upgrade (CenterForOpenScience#10648) Revert "[ENG-3685] Add permissions for withdrawn registration files (CenterForOpenScience#10650)" (CenterForOpenScience#10666) Check Registration READ perms on the Registration - Do not record download metrics for renders Fix signature Allow DOI metadata updates to be queued [ENG-3685] Add permissions for withdrawn registration files (CenterForOpenScience#10650) Update CHANGELOG, bump version [ENG-5030] Preprints Phase 2 - BE (CenterForOpenScience#10617) Update CHANGELOG, bump version Ensure Assumed-HAM users do not get autobanned [ENG-5762] Get GV set up in osf docker configs (CenterForOpenScience#10643) [ENG-5718] Use `make_auth` to avoid assumptions about `auth.user` (CenterForOpenScience#10647) [ENG-5699] Framework for getting Addon Info from GV (CenterForOpenScience#10641) [ENG-5178] Allow unauthenticated users to see public files (CenterForOpenScience#10645) Fix RelationshipPostMakesNoChanges exception in project creation (CenterForOpenScience#10644) [ENG - 5008] Support Unicode and special characters in file names during archiving (CenterForOpenScience#10627) Set Default Resource Type for Registrations to "Study Registration" (CenterForOpenScience#10636) Configurable GV Mock + HMAC Auth (CenterForOpenScience#10623) ... # Conflicts: # addons/base/views.py # api/caching/tasks.py # api_tests/files/views/test_file_detail.py # api_tests/wb/views/test_wb_hooks.py # osf/management/commands/data_storage_usage.py # osf/management/commands/reindex_quickfiles.py # osf/management/commands/transfer_quickfiles_to_projects.py # osf/models/__init__.py # osf/models/private_link.py # osf/models/quickfiles.py # osf/models/user.py # scripts/fix_merged_user_quickfiles.py # tests/test_views.py # website/mails/mails.py # website/search/elastic_search.py # website/settings/defaults.py
- Loading branch information
Showing
1,459 changed files
with
44,823 additions
and
27,331 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
{ | ||
"directory": "website/static/vendor/bower_components" | ||
"directory": "website/static/vendor/bower_components", | ||
"registry": "https://bower.herokuapp.com" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
ALLOWED_HOSTS="localhost,192.168.168.167" | ||
CORS_ALLOWED_ORIGINS="http://localhost:5000,http://192.168.168.167:5000" | ||
OSFDB_HOST=192.168.168.167 | ||
POSTGRES_HOST="$OSFDB_HOST" | ||
OSF_BASE_URL="http://192.168.168.167:5000" | ||
OSF_API_BASE_URL="http://192.168.168.167:8000" | ||
POSTGRES_USER="postgres" | ||
POSTGRES_DB="gravyvalet" | ||
SECRET_KEY="secret" | ||
PYTHONUNBUFFERED=0 # This when set to 0 will allow print statements to be visible in the Docker logs | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
name: 'Generate Report' | ||
description: 'Generate test report from junit xml file' | ||
runs: | ||
using: "composite" | ||
steps: | ||
- name: Generate Report | ||
uses: dorny/test-reporter@v1 | ||
if: success() || failure() # run this step even if previous step failed | ||
with: | ||
name: ${{github.job}} REPORT # Name of the check run which will be created | ||
path: report.xml # Path to test results | ||
reporter: java-junit # Format of test results | ||
max-annotations: 49 | ||
list-tests: failed | ||
list-suites: failed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -203,4 +203,3 @@ ssl/ | |
|
||
# pyenv | ||
.python-version | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,24 @@ | ||
default_language_version: | ||
python: python3.6 | ||
python: python3.12 | ||
repos: | ||
- repo: https://github.com/asottile/add-trailing-comma | ||
rev: v0.7.0 | ||
rev: v3.1.0 | ||
hooks: | ||
- id: add-trailing-comma | ||
# TODO: Remove this line. For now, we only format the api/ directory | ||
files: ^api/ | ||
- repo: https://github.com/pre-commit/pre-commit-hooks | ||
rev: v1.4.0 | ||
rev: v4.6.0 | ||
hooks: | ||
- id: double-quote-string-fixer | ||
- id: trailing-whitespace | ||
exclude: website/static/vendor/* | ||
- id: flake8 | ||
additional_dependencies: ["flake8==3.6.0", "flake8-mutable==1.2.0"] | ||
exclude: "^(website/static/vendor/|osf/metadata/definitions/.*\\.xsd)" | ||
- repo: https://github.com/pycqa/flake8 | ||
rev: '7.0.0' # pick a git hash / tag to point to | ||
hooks: | ||
- id: flake8 | ||
additional_dependencies: ["flake8-mutable==1.2.0"] | ||
- repo: https://github.com/pre-commit/mirrors-jshint | ||
rev: v2.9.6 | ||
rev: v2.13.6 | ||
hooks: | ||
- id: jshint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.