Skip to content

Commit

Permalink
Merge branch 'hotfix/24.05.3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mfraezz committed Aug 9, 2024
2 parents 99d8b70 + 406c027 commit 3920a29
Show file tree
Hide file tree
Showing 22 changed files with 462 additions and 560 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.cache
key: reqs_${{ hashFiles('**/requirements.txt') }}
key: reqs_${{ hashFiles('**/pyproject.toml') }}
restore-keys: reqs
- run: |
mkdir -p ~/.cache/downloads
Expand Down
1 change: 0 additions & 1 deletion addons/bitbucket/requirements.txt

This file was deleted.

5 changes: 0 additions & 5 deletions addons/boa/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/box/requirements.txt

This file was deleted.

3 changes: 0 additions & 3 deletions addons/dataverse/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/dropbox/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/figshare/requirements.txt

This file was deleted.

3 changes: 0 additions & 3 deletions addons/github/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/gitlab/requirements.txt

This file was deleted.

2 changes: 0 additions & 2 deletions addons/mendeley/requirements.txt

This file was deleted.

Empty file removed addons/onedrive/requirements.txt
Empty file.
2 changes: 0 additions & 2 deletions addons/owncloud/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/s3/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/twofactor/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/wiki/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion addons/zotero/requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions api/base/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from furl import furl
from urllib.parse import urlunsplit, urlsplit, parse_qs, urlencode, quote
from urllib.parse import urlunsplit, urlsplit, parse_qs, urlencode
from packaging.version import Version
from hashids import Hashids

Expand Down Expand Up @@ -236,7 +236,7 @@ def waterbutler_api_url_for(node_id, provider, path='/', _internal=False, base_u
# NOTE: furl encoding to be verified later
url = furl(website_settings.WATERBUTLER_INTERNAL_URL if _internal else (base_url or website_settings.WATERBUTLER_URL))
segments = ['v1', 'resources', node_id, 'providers', provider] + path.split('/')[1:]
url.add(path=[quote(x) for x in segments])
url.add(path=segments)
url.args.update(kwargs)
return url.url

Expand Down
783 changes: 416 additions & 367 deletions poetry.lock

Large diffs are not rendered by default.

56 changes: 43 additions & 13 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages = [{include = "osf"}]
python = "^3.12"
wheel = "0.42.0"
invoke = "2.2.0"
Werkzeug = "3.0.1"
Werkzeug = "3.0.3"
Flask = "3.0.2"
Mako = "1.3.2"
Markdown = "3.5.2"
Expand Down Expand Up @@ -55,8 +55,9 @@ oauthlib = "3.2.2"
requests-oauthlib = "1.3.1"
sentry-sdk = {version= "2.2.0", extras = ["django", "flask", "celery"]}
django-redis = "5.4.0"

# API requirements
Django = "4.2.13"
Django = "4.2.15"
djangorestframework = "3.15.1"
django-cors-headers = "4.3.1"
djangorestframework-bulk = "0.2.1"
Expand All @@ -69,38 +70,48 @@ django-timezone-field = "6.1.0" # pin to delay untested major version bump
pyjwe = "1.0.0"
# Required by pyjwe and ndg-httpsclient
cryptography = "42.0.5"
#rpds-py==0.18.0
jsonschema = "4.21.1"
django-guardian = "2.4.0"

# Admin requirements
# fork to generate old webpack stats format so we don't have to upgrade admin's webpack
django-webpack-loader = {git = "https://github.com/CenterForOpenScience/django-webpack-loader.git", rev = "af8438c2da909ec9f2188a6c07c9d2caad0f7e93"} # branch is feature/v1-webpack-stats
django-sendgrid-v5 = "1.2.3" # metadata says python 3.10 not supported, but tests pass

# Analytics requirements
# Analytics requirement
keen = "0.7.0"
geoip2 = "4.7.0"

# OSF models
django-typed-models = "0.14.0"
django-storages = "1.14.3"
google-cloud-storage = "2.16.0" # dependency of django-storages, hard-pin to version
django-dirtyfields = "1.9.2"
django-extensions = "3.2.3"
psycopg2 = "2.9.9"

# Reviews requirements
transitions = "0.8.11"

# identifiers
datacite = "1.1.3"

# metadata
rdflib = "7.0.0"
packaging = "^24.0"

colorlog = "6.8.2"

# Metrics
# fork to pin installed version of elasticsearch-dsl
django-elasticsearch-metrics = {git ="https://github.com/CenterForOpenScience/django-elasticsearch-metrics.git", rev = "f5b9312914154e213aa01731e934c593e3434269"} # branch is feature/pin-esdsl

# Impact Metrics CSV Export
djangorestframework-csv = "3.0.2"
gevent = "24.2.1"
packaging = "^24.0"

[tool.poetry.group.dev.dependencies]
# Requirements that are used in the development environment only
pytest = "7.4.4"
pytest-socket = "0.7.0"
pytest-xdist = "3.5.0"
Expand Down Expand Up @@ -136,33 +147,52 @@ nplusone = "1.0.0"
django-silk = "5.1.0"

[tool.poetry.group.addons.dependencies]
# Requirements for the boa add-on
## boa
boa-api = "0.1.14"

# Requirements for running asyncio in celery, using 3.4.1 for Python 3.6 compatibility
# Requirements for running asyncio in celery
asgiref = "3.7.2"

## box
boxsdk = "3.9.2"
# Allow for optional timeout parameter.
# https://github.com/IQSS/dataverse-client-python/pull/27

## dataverse
# new features & dependency updates
dataverse = {git = "https://github.com/CenterForOpenScience/dataverse-client-python.git", rev="2b3827578048e6df3818f82381c7ea9a2395e526"} # branch is feature/dv-client-updates

## dropbox
dropbox = "11.36.2"

## github
cachecontrol = "0.14.0"
"github3.py" = "4.0.1"
uritemplate = "4.1.1"

## gitlab
python-gitlab = "4.4.0"

## mendeley
# up-to-date with mendeley's master + add folder support and future dep updates
mendeley = {git = "https://github.com/CenterForOpenScience/mendeley-python-sdk.git", rev="be8a811fa6c3b105d9f5c656cabb6b1ba855ed5b"} # branch is feature/osf-dep-updates
# Requirements for the owncloud add-on

## owncloud
pyocclient = "0.6.0"

## s3
boto3 = "1.34.60"

## twofactor
pyotp = "2.9.0"

## wiki
# needs pymongo, but already installed in deps
# was 4.6.3 in wiki requirements, but older version seems to work

## zotero
Pyzotero = "1.5.18"

[tool.poetry.group.release.dependencies]
# newrelic APM agent
# Requirements to be installed on server deployments
newrelic = "9.7.1"
# uwsgi
uwsgi = "2.0.24"


Expand Down
107 changes: 0 additions & 107 deletions requirements.txt

This file was deleted.

38 changes: 0 additions & 38 deletions requirements/dev.txt

This file was deleted.

8 changes: 0 additions & 8 deletions requirements/release.txt

This file was deleted.

0 comments on commit 3920a29

Please sign in to comment.