Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade Python requirements #421

Merged
merged 3 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .ci/docker.mk
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.PHONY: ci_down ci_start ci_stop ci_test ci_up

ci_up: ## Create containers used to run tests on ci CI
docker-compose -f .ci/docker-compose-ci.yml up -d
docker compose -f .ci/docker-compose-ci.yml up -d

ci_start: ## Start containers stopped by `ci_stop`
docker-compose -f .ci/docker-compose-ci.yml start
docker compose -f .ci/docker-compose-ci.yml start

ci_test: ## Run tests on Docker containers, as on ci CI
docker exec -e TERM=$(TERM) -e TOXENV=$(TOXENV) -u root -it edx_notes_api /edx/app/edx_notes_api/edx_notes_api/.ci/run_tests.sh
Expand All @@ -13,8 +13,8 @@ ci_pii_check: ## Run pii annotations checker on Docker containers, as on ci CI
docker exec -e TERM=$(TERM) -e TOXENV=$(TOXENV) -u root -it edx_notes_api /edx/app/edx_notes_api/edx_notes_api/.ci/run_pii_checker.sh

ci_stop: ## Stop running containers created by `ci_up` without removing them
docker-compose -f .ci/docker-compose-ci.yml stop
docker compose -f .ci/docker-compose-ci.yml stop

ci_down: ## Stop and remove containers and other resources created by `ci_up`
docker-compose -f .ci/docker-compose-ci.yml down
docker compose -f .ci/docker-compose-ci.yml down

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v2
- name: Start container
run: |
docker-compose -f .ci/docker-compose-ci.yml up -d
docker compose -f .ci/docker-compose-ci.yml up -d
- name: Install Dependencies
run: |
docker exec -e TOXENV=${{ matrix.python-version }}-${{ matrix.django-version }} --env DB_HOST=${{ matrix.db-version }} -u root edx_notes_api \
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ drf-yasg==1.21.7
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# -r requirements/base.in
# edx-drf-extensions
Expand Down Expand Up @@ -116,7 +116,7 @@ psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
pyjwt[crypto]==2.8.0
pyjwt[crypto]==2.9.0
# via
# -r requirements/base.in
# drf-jwt
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pyproject-hooks==1.1.0
# via
# build
# pip-tools
wheel==0.43.0
wheel==0.44.0
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.43.0
wheel==0.44.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via -r requirements/pip.in
setuptools==71.1.0
setuptools==72.1.0
# via -r requirements/pip.in
8 changes: 4 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ code-annotations==1.8.0
# via -r requirements/test.in
colorama==0.4.6
# via pylint
coverage[toml]==7.6.0
coverage[toml]==7.6.1
# via
# -r requirements/test.in
# pytest-cov
Expand Down Expand Up @@ -107,7 +107,7 @@ drf-yasg==1.21.7
# via -r requirements/base.txt
edx-django-release-util==1.4.0
# via -r requirements/base.txt
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# -r requirements/base.txt
# edx-drf-extensions
Expand All @@ -132,7 +132,7 @@ elasticsearch-dsl==7.4.1
# django-elasticsearch-dsl-drf
factory-boy==3.3.0
# via -r requirements/test.in
faker==26.0.0
faker==26.1.0
# via factory-boy
filelock==3.15.4
# via
Expand Down Expand Up @@ -205,7 +205,7 @@ pycparser==2.22
# cffi
pygments==2.18.0
# via diff-cover
pyjwt[crypto]==2.8.0
pyjwt[crypto]==2.9.0
# via
# -r requirements/base.txt
# drf-jwt
Expand Down
Loading