Skip to content

Commit

Permalink
fix(build): Trying solution for relative local dependency installation
Browse files Browse the repository at this point in the history
  • Loading branch information
monotasker committed Sep 24, 2024
1 parent 37199ea commit c9d106c
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 158 deletions.
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@
path = invenio_remote_user_data_kcworks/dependencies/invenio-group-collections
url = https://github.com/MESH-Research/invenio-group-collections.git
branch = main
[submodule "invenio_remote_user_data_kcworks/dependencies/invenio-records-resources"]
path = invenio_remote_user_data_kcworks/dependencies/invenio-records-resources
url = https://github.com/MESH-Research/invenio-records-resources.git
branch = local-working
[submodule "invenio_remote_user_data_kcworks/dependencies/invenio-communities"]
path = invenio_remote_user_data_kcworks/dependencies/invenio-communities
url = https://github.com/MESH-Research/invenio-communities.git
branch = local-working
3 changes: 1 addition & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ name = "pypi"
celery = "*"
deepdiff = "*"
invenio-app-rdm = "<13.0.0"
invenio-group-collections = {file = "./invenio_remote_user_data_kcworks/dependencies/invenio-group-collections", editable = true}
invenio-queues = "*"
invenio-remote-user-data-kcworks = {file = ".", editable = true}
invenio-search = "*"
invenio-utilities-tuw = "*"
opensearch-dsl = "*"
invenio-remote-user-data-kcworks = {file = ".", editable = true}

[dev-packages]
build = "*"
Expand Down
151 changes: 4 additions & 147 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,35 @@ REMOTE_USER_DATA_WEBHOOK_TOKEN (SECRET!! DO NOT place in config file!!)
Other environment variables

The names of the environment variables for the security tokens for API requests to each remote ID provider should be set in the REMOTE_USER_DATA_API_ENDPOINTS configuration variable. The values of these variables should be set in the .env file in the root directory of the Invenio instance or set in the server system environment.

## Developing this Extension

### Versioning

This project uses semantic versioning with a pre-release tag where appropriate. (For an explanation of semantic versioning, see [semver.org](https://semver.org/) and [this Medium article](https://medium.com/@jteodoro/gently-introduction-to-semantic-versioning-f4e015956c8c).) Alpha and beta releases are indicated by the presence of an "-alpha1" or "-beta1" suffix to the version number.

#### Updating the version number

The version number is managed by the bumpver tool, which is configured in the pyproject.toml file. To update to a new major version (a breaking change, not backwards compatible), run

```shell
pipenv run bumpver update --major
```

To update to a new minor version (a new feature, backwards compatible), run

```shell
pipenv run bumpver update --minor
```

To update to a new patch version (a bug fix, backwards compatible), run

```shell
pipenv run bumpver update --patch
```

To update to a new alpha or beta version, run

```shell
pipenv run bumpver update --tag
```
8 changes: 6 additions & 2 deletions invenio_remote_user_data_kcworks/components/groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
from invenio_accounts.models import Role, User
from invenio_accounts.proxies import current_accounts
from invenio_pidstore.errors import PIDDoesNotExistError
from invenio_users_resources.proxies import current_groups_service
from invenio_records_resources.resources.errors import PermissionDeniedError
from invenio_users_resources.proxies import (
current_groups_service,
)
from invenio_users_resources.resources.errors import (
PermissionDeniedError,
)
from invenio_users_resources.services.groups.results import (
GroupItem,
GroupList,
Expand Down
Empty file.
Submodule invenio-communities added at 8b1068
8 changes: 6 additions & 2 deletions invenio_remote_user_data_kcworks/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
from invenio_administration.generators import Administration

# from invenio_administration.permissions import administration_access_action
from invenio_communities.permissions import CommunityPermissionPolicy
from invenio_communities.permissions import (
CommunityPermissionPolicy,
)
from invenio_communities.generators import (
AllowedMemberTypes,
CommunityCurators,
Expand All @@ -16,7 +18,9 @@
# FIXME: This is a temporary hack since the GroupsEnabled generator
# has moved
try:
from invenio_users_resources.services.generators import GroupsEnabled
from invenio_users_resources.services.generators import (
GroupsEnabled,
)
except ImportError:
from invenio_communities.generators import GroupsEnabled
from invenio_records_permissions import BasePermissionPolicy
Expand Down
Loading

0 comments on commit c9d106c

Please sign in to comment.