chore: pkg-config added to Docker File (#95)

* chore: `pkg-config` added to Docker File + PIP Reqs This is to future proof the update of mysql client in future releases. See: edx/edx-arch-experiments#349 * fix: Docker Compose issues * fix: Bringing all pip req.s in line with those used by the code in `2u/project-theseus` * fix: make upgrade on Py3.8 This is a guess, but since im upgrading the requirements locally, and i rebuilt my venv... It swapped Python versions to 3.10 instead of 3.8 (the target of our other tooling)... ``` brew install [email protected] python3.8 -m venv .venv . .venv/bin/activate make upgrade ```
edx · Sep 5, 2023 · b0d3ed3 · b0d3ed3
1 parent 00771a7
commit b0d3ed3
Show file tree

Hide file tree

Showing 21 changed files with 993 additions and 768 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,13 +20,16 @@ MAINTAINER [email protected]
 
 # gcc; for compiling python extensions distributed with python packages like mysql-client
 
+# pkg-config is now required for libmysqlclient-dev and its python dependencies
+
 # If you add a package here please include a comment above describing what it is used for
 RUN apt-get update && apt-get -qy install --no-install-recommends \
  language-pack-en \
  locales \
  python3.8 \
  python3-pip \
  libmysqlclient-dev \
+ pkg-config \
  libssl-dev \
  python3-dev \
  gcc

diff --git a/commerce_coordinator/apps/core/signals.py b/commerce_coordinator/apps/core/signals.py
@@ -23,6 +23,7 @@ def test_receiver_exception(sender, **kwargs):
     how an exception could be handled.
     """
     logger.info(f"CORE TEST_RECEIVER_EXCEPTION CALLED with sender '{sender}'!")
+    # pylint: disable=broad-exception-raised
     raise Exception("Oh no, something went wrong!")
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,8 @@ services:
     container_name: commerce-coordinator.memcache
 
   app:
-    image: openedx/commerce-coordinator
+    image: devstack # this should exist locally from previous devstack, we will build our Dockerfile
+    build: .        # Build Dockerfile if we need to.
     container_name: commerce-coordinator.app
     volumes:
       - .:/edx/app/commerce-coordinator/

diff --git a/requirements/base.in b/requirements/base.in
@@ -17,3 +17,4 @@ edx-rest-api-client
 mysqlclient
 openedx-filters
 pytz
+stripe
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,28 +1,32 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    make upgrade
 #
 amqp==5.1.1
     # via kombu
-asgiref==3.5.2
+asgiref==3.7.2
     # via django
-async-timeout==4.0.2
+async-timeout==4.0.3
     # via redis
-billiard==3.6.4.0
+backports-zoneinfo[tzdata]==0.2.1
+    # via
+    #   celery
+    #   kombu
+billiard==4.1.0
     # via celery
-celery[redis]==5.2.7
+celery[redis]==5.3.4
     # via -r requirements/base.in
-certifi==2022.6.15
+certifi==2023.7.22
     # via requests
 cffi==1.15.1
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==2.1.0
+charset-normalizer==3.2.0
     # via requests
-click==8.1.3
+click==8.1.7
     # via
     #   celery
     #   click-didyoumean
@@ -33,186 +37,185 @@ click-didyoumean==0.3.0
     # via celery
 click-plugins==1.1.1
     # via celery
-click-repl==0.2.0
+click-repl==0.3.0
     # via celery
 coreapi==2.3.3
     # via
     #   django-rest-swagger
     #   openapi-codec
 coreschema==0.0.4
     # via coreapi
-cryptography==37.0.4
+cryptography==41.0.3
     # via
     #   pyjwt
     #   social-auth-core
 defusedxml==0.7.1
     # via
     #   python3-openid
     #   social-auth-core
-deprecated==1.2.13
-    # via redis
-django==3.2.14
+django==3.2.21
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
     #   django-cors-headers
     #   django-crum
     #   django-extensions
+    #   django-waffle
     #   djangorestframework
     #   drf-jwt
     #   edx-auth-backends
     #   edx-django-release-util
     #   edx-django-utils
     #   edx-drf-extensions
     #   openedx-filters
-django-cors-headers==3.13.0
+    #   social-auth-app-django
+django-cors-headers==4.2.0
     # via -r requirements/base.in
 django-crum==0.7.9
     # via edx-django-utils
-django-extensions==3.1.5
+django-extensions==3.2.3
     # via -r requirements/base.in
 django-rest-swagger==2.2.0
     # via -r requirements/base.in
-django-waffle==2.5.0
+django-waffle==4.0.0
     # via
     #   -r requirements/base.in
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.13.1
+djangorestframework==3.14.0
     # via
     #   -r requirements/base.in
     #   django-rest-swagger
     #   drf-jwt
     #   edx-drf-extensions
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-auth-backends==4.1.0
+edx-auth-backends==4.2.0
     # via -r requirements/base.in
-edx-django-release-util==1.2.0
+edx-django-release-util==1.3.0
     # via -r requirements/base.in
-edx-django-utils==5.0.0
+edx-django-utils==5.7.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==8.0.1
+edx-drf-extensions==8.9.2
     # via -r requirements/base.in
-edx-opaque-keys==2.3.0
+edx-opaque-keys==2.5.0
     # via edx-drf-extensions
-edx-rest-api-client==5.5.0
+edx-rest-api-client==5.6.0
     # via -r requirements/base.in
-future==0.18.2
-    # via pyjwkest
-idna==3.3
+idna==3.4
     # via requests
 itypes==1.2.0
     # via coreapi
 jinja2==3.1.2
     # via coreschema
-kombu==5.2.4
+kombu==5.3.2
     # via celery
-markupsafe==2.1.1
+markupsafe==2.1.3
     # via jinja2
-mysqlclient==2.1.1
+mysqlclient==2.2.0
     # via -r requirements/base.in
-newrelic==7.14.0.177
+newrelic==9.0.0
     # via edx-django-utils
-oauthlib==3.2.0
+oauthlib==3.2.2
     # via
     #   requests-oauthlib
     #   social-auth-core
 openapi-codec==1.3.2
     # via django-rest-swagger
-openedx-filters==0.7.0
+openedx-filters==1.6.0
     # via -r requirements/base.in
-packaging==21.3
-    # via redis
-pbr==5.9.0
+pbr==5.11.1
     # via stevedore
-prompt-toolkit==3.0.30
+prompt-toolkit==3.0.39
     # via click-repl
-psutil==5.9.1
+psutil==5.9.5
     # via edx-django-utils
 pycparser==2.21
     # via cffi
-pycryptodomex==3.15.0
-    # via pyjwkest
-pyjwkest==1.4.2
-    # via edx-drf-extensions
-pyjwt[crypto]==2.4.0
+pyjwt[crypto]==2.8.0
     # via
     #   drf-jwt
     #   edx-auth-backends
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
-pymongo==3.12.3
+pymongo==3.13.0
     # via edx-opaque-keys
 pynacl==1.5.0
     # via edx-django-utils
-pyparsing==3.0.9
-    # via packaging
 python-dateutil==2.8.2
-    # via edx-drf-extensions
+    # via
+    #   celery
+    #   edx-drf-extensions
 python3-openid==3.2.0
     # via social-auth-core
-pytz==2022.1
+pytz==2023.3.post1
     # via
     #   -r requirements/base.in
-    #   celery
     #   django
     #   djangorestframework
-pyyaml==6.0
+pyyaml==6.0.1
     # via edx-django-release-util
-redis==4.3.4
+redis==4.6.0
     # via celery
-requests==2.28.1
+requests==2.31.0
     # via
     #   coreapi
     #   edx-drf-extensions
     #   edx-rest-api-client
-    #   pyjwkest
     #   requests-oauthlib
     #   slumber
     #   social-auth-core
+    #   stripe
 requests-oauthlib==1.3.1
     # via social-auth-core
 semantic-version==2.10.0
     # via edx-drf-extensions
-simplejson==3.17.6
+simplejson==3.19.1
     # via django-rest-swagger
 six==1.16.0
     # via
-    #   click-repl
     #   edx-auth-backends
     #   edx-django-release-util
     #   edx-drf-extensions
-    #   pyjwkest
     #   python-dateutil
 slumber==0.7.1
     # via edx-rest-api-client
-social-auth-app-django==5.0.0
+social-auth-app-django==5.3.0
     # via edx-auth-backends
-social-auth-core==4.3.0
+social-auth-core==4.4.2
     # via
     #   edx-auth-backends
     #   social-auth-app-django
-sqlparse==0.4.2
+sqlparse==0.4.4
     # via django
-stevedore==3.5.0
+stevedore==5.1.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
+stripe==6.2.0
+    # via -r requirements/base.in
+typing-extensions==4.7.1
+    # via
+    #   asgiref
+    #   edx-opaque-keys
+    #   kombu
+    #   stripe
+tzdata==2023.3
+    # via
+    #   backports-zoneinfo
+    #   celery
 uritemplate==4.1.1
     # via coreapi
-urllib3==1.26.9
+urllib3==2.0.4
     # via requests
 vine==5.0.0
     # via
     #   amqp
     #   celery
     #   kombu
-wcwidth==0.2.5
+wcwidth==0.2.6
     # via prompt-toolkit
-wrapt==1.14.1
-    # via deprecated
diff --git a/requirements/ci.in b/requirements/ci.in
@@ -1,5 +1,6 @@
-# Requirements for running tests on CI
+# Requirements for running tests in CI
+
 -c constraints.txt
 
-codecov                   # Code coverage reporting
 tox                       # Virtualenv management for tests
+tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -1,46 +1,35 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    make upgrade
 #
-certifi==2022.6.15
-    # via requests
-charset-normalizer==2.1.0
-    # via requests
-codecov==2.1.12
-    # via -r requirements/ci.in
-coverage==6.4.1
-    # via codecov
-distlib==0.3.4
+distlib==0.3.7
     # via virtualenv
-filelock==3.7.1
+filelock==3.12.3
     # via
     #   tox
     #   virtualenv
-idna==3.3
-    # via requests
-packaging==21.3
+packaging==23.1
     # via tox
-platformdirs==2.5.2
+platformdirs==3.10.0
     # via virtualenv
-pluggy==1.0.0
+pluggy==1.3.0
     # via tox
 py==1.11.0
     # via tox
-pyparsing==3.0.9
-    # via packaging
-requests==2.28.1
-    # via codecov
 six==1.16.0
-    # via
-    #   tox
-    #   virtualenv
-toml==0.10.2
     # via tox
-tox==3.25.1
+tomli==2.0.1
+    # via tox
+tox==3.28.0
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -r requirements/ci.in
+    #   tox-battery
+tox-battery==0.6.2
     # via -r requirements/ci.in
-urllib3==1.26.9
-    # via requests
-virtualenv==20.15.1
+typing-extensions==4.7.1
+    # via filelock
+virtualenv==20.24.4
     # via tox