Skip to content

Commit

Permalink
Showing 20 changed files with 150 additions and 121 deletions.
2 changes: 1 addition & 1 deletion .ci/config.yml
Original file line number Diff line number Diff line change
@@ -92,6 +92,6 @@ SUPERSET_OAUTH2_CLIENT_SECRET: StkPwE5GzPuyH4Rp
SUPERSET_ROW_LEVEL_SECURITY_XAPI_GROUP_KEY: xapi_course_id
SUPERSET_SECRET_KEY: WlgA6QSQKCUNGD9PAaji0JHY
SUPERSET_XAPI_DASHBOARD_SLUG: openedx-xapi
ASPECTS_VERSION: 0.63.0
ASPECTS_VERSION: 0.65.1
DOCKER_IMAGE_OPENEDX: edunext/openedx-aspects:{{ASPECTS_VERSION}}
DOCKER_IMAGE_OPENEDX_DEV: edunext/openedx-aspects-dev:{{ASPECTS_VERSION}}
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yaml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ jobs:
bump2version --new-version ${{ steps.tag_version.outputs.new_version }} setup.cfg tutoraspects/__about__.py .ci/config.yml
- name: Update Changelog
if: steps.tag_version.outputs.new_version
uses: stefanzweifel/changelog-updater-action@v1.9.1
uses: stefanzweifel/changelog-updater-action@v1.10.0
with:
latest-version: ${{ steps.tag_version.outputs.new_tag }}
release-notes: ${{ steps.tag_version.outputs.changelog }}
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -5,6 +5,44 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v0.65.1 - 2023-12-06

### [0.65.1](https://github.com/openedx/tutor-contrib-aspects/compare/v0.65.0...v0.65.1) (2023-12-06)

### Bug Fixes

* Add more informational error message. ([703e969](https://github.com/openedx/tutor-contrib-aspects/commit/703e969e8cca77cb44fcb095fc7edd9033c7f000))
* Bump ERB to 7.2.0 ([f6ef21f](https://github.com/openedx/tutor-contrib-aspects/commit/f6ef21f51dd1baf5a07bbbcf2115082289ff70b1))

## v0.65.0 - 2023-11-29

### [0.65.0](https://github.com/openedx/tutor-contrib-aspects/compare/v0.64.0...v0.65.0) (2023-11-29)

#### Features

* add external id table ([3c50bd7](https://github.com/openedx/tutor-contrib-aspects/commit/3c50bd76b49da8379349fc5e52398af81e4e8089))

## v0.64.0 - 2023-11-29

### [0.64.0](https://github.com/openedx/tutor-contrib-aspects/compare/v0.63.1...v0.64.0) (2023-11-29)

#### Features

* Adds course_key_short computed field ([93e07da](https://github.com/openedx/tutor-contrib-aspects/commit/93e07da18364eb45abfd57af5159d91cd5753b2a))

#### Bug Fixes

* re-adds the "Events per course" pie chart to the Operator > Courses tab ([20fc7b5](https://github.com/openedx/tutor-contrib-aspects/commit/20fc7b59efb7188d4a19dec56ff366fa6cf89ce4))

## v0.63.1 - 2023-11-23

### [0.63.1](https://github.com/openedx/tutor-contrib-aspects/compare/v0.63.0...v0.63.1) (2023-11-23)

### Bug Fixes

- containerPort values must be numeric ([332e79b](https://github.com/openedx/tutor-contrib-aspects/commit/332e79b4d7b7ae8e11ed7845dad4676bc8c040a4))
- use tutor variables to expose clickhouse container ports in k8s ([8c1720f](https://github.com/openedx/tutor-contrib-aspects/commit/8c1720fd35209d062fee8dad6b0b99cc1c764ea7))

## v0.63.0 - 2023-11-09

### [0.63.0](https://github.com/openedx/tutor-contrib-aspects/compare/v0.62.4...v0.63.0) (2023-11-09)
16 changes: 8 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ appdirs==1.4.4
# via tutor
asttokens==2.4.1
# via transifex-python
bcrypt==4.0.1
bcrypt==4.1.1
# via -r requirements/base.in
cachetools==5.3.2
# via google-auth
certifi==2023.7.22
certifi==2023.11.17
# via
# kubernetes
# requests
@@ -25,17 +25,17 @@ click==8.1.7
# tutor
future==0.18.3
# via pyseeyou
google-auth==2.23.4
google-auth==2.24.0
# via kubernetes
idna==3.4
idna==3.6
# via requests
jinja2==3.1.2
# via tutor
kubernetes==28.1.0
# via tutor
markupsafe==2.1.3
# via jinja2
mypy==1.7.0
mypy==1.7.1
# via tutor
mypy-extensions==1.0.0
# via mypy
@@ -47,7 +47,7 @@ openedx-atlas==0.5.0
# via -r requirements/base.in
parsimonious==0.10.0
# via pyseeyou
pyasn1==0.5.0
pyasn1==0.5.1
# via
# pyasn1-modules
# rsa
@@ -85,7 +85,7 @@ toolz==0.12.0
# via pyseeyou
transifex-python==3.5.0
# via -r requirements/base.in
tutor==16.1.5
tutor==16.1.7
# via -r requirements/base.in
typing-extensions==4.8.0
# via
@@ -95,5 +95,5 @@ urllib3==1.26.18
# via
# kubernetes
# requests
websocket-client==1.6.4
websocket-client==1.7.0
# via kubernetes
5 changes: 5 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -21,3 +21,8 @@ elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
26 changes: 13 additions & 13 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -16,15 +16,15 @@ asttokens==2.4.1
# via
# -r requirements/base.txt
# transifex-python
bcrypt==4.0.1
bcrypt==4.1.1
# via -r requirements/base.txt
black==23.11.0
# via -r requirements/dev.in
cachetools==5.3.2
# via
# -r requirements/base.txt
# google-auth
certifi==2023.7.22
certifi==2023.11.17
# via
# -r requirements/base.txt
# kubernetes
@@ -41,7 +41,7 @@ click==8.1.7
# black
# transifex-python
# tutor
cryptography==41.0.5
cryptography==41.0.7
# via secretstorage
dill==0.3.7
# via pylint
@@ -51,15 +51,15 @@ future==0.18.3
# via
# -r requirements/base.txt
# pyseeyou
google-auth==2.23.4
google-auth==2.24.0
# via
# -r requirements/base.txt
# kubernetes
idna==3.4
idna==3.6
# via
# -r requirements/base.txt
# requests
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via
# keyring
# pyinstaller
@@ -96,7 +96,7 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
mypy==1.7.0
mypy==1.7.1
# via
# -r requirements/base.txt
# tutor
@@ -130,7 +130,7 @@ platformdirs==4.0.0
# via
# black
# pylint
pyasn1==0.5.0
pyasn1==0.5.1
# via
# -r requirements/base.txt
# pyasn1-modules
@@ -145,7 +145,7 @@ pycryptodome==3.19.0
# via
# -r requirements/base.txt
# tutor
pygments==2.16.1
pygments==2.17.2
# via
# readme-renderer
# rich
@@ -190,7 +190,7 @@ requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==13.6.0
rich==13.7.0
# via twine
rsa==4.9
# via
@@ -210,15 +210,15 @@ tomli==2.0.1
# black
# mypy
# pylint
tomlkit==0.12.2
tomlkit==0.12.3
# via pylint
toolz==0.12.0
# via
# -r requirements/base.txt
# pyseeyou
transifex-python==3.5.0
# via -r requirements/base.txt
tutor==16.1.5
tutor==16.1.7
# via -r requirements/base.txt
twine==4.0.2
# via -r requirements/dev.in
@@ -237,7 +237,7 @@ urllib3==1.26.18
# kubernetes
# requests
# twine
websocket-client==1.6.4
websocket-client==1.7.0
# via
# -r requirements/base.txt
# kubernetes
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via build
packaging==23.2
# via build
@@ -21,7 +21,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.3
wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.41.3
wheel==0.42.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.3.1
# via -r requirements/pip.in
setuptools==68.2.2
setuptools==69.0.2
# via -r requirements/pip.in
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[bumpversion]
current_version = 0.63.0
current_version = 0.65.1
commit = False
tag = False
2 changes: 1 addition & 1 deletion tutoraspects/__about__.py
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
Expose some package metadata.
"""

__version__ = "0.63.0"
__version__ = "0.65.1"
6 changes: 3 additions & 3 deletions tutoraspects/patches/k8s-deployments
Original file line number Diff line number Diff line change
@@ -30,9 +30,9 @@ spec:
image: {{ DOCKER_IMAGE_CLICKHOUSE }}
name: clickhouse
ports:
- containerPort: 8123
- containerPort: 9000
- containerPort: 9009
- containerPort: {{ CLICKHOUSE_HOST_INSECURE_HTTP_PORT }}
- containerPort: {{ CLICKHOUSE_HOST_INSECURE_NATIVE_PORT }}
- containerPort: {{ CLICKHOUSE_HOST_TLS_NATIVE_PORT }}
volumeMounts:
- mountPath: /var/lib/clickhouse/
name: data
2 changes: 1 addition & 1 deletion tutoraspects/plugin.py
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
"OPENEDX_EXTRA_PIP_REQUIREMENTS",
[
"openedx-event-sink-clickhouse==0.4.0",
"edx-event-routing-backends==v7.0.1",
"edx-event-routing-backends==v7.2.0",
],
),
(
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@ def upgrade():
`time_last_dumped` String NOT NULL
)
ENGINE = {engine}
PARTITION BY user_id MOD 100
PRIMARY KEY (external_user_id, time_last_dumped)
PARTITION BY user_id MOD 100
ORDER BY (external_user_id, time_last_dumped)
"""
)
Loading

0 comments on commit fcfeb9f

Please sign in to comment.