dummy commit message

CHANGELOG.rst

@@ -5,6 +5,28 @@ Change Log
    This file loosely adheres to the structure of https://keepachangelog.com/,
    but in reStructuredText instead of Markdown.
 
+2024-08-03
+**********
+
+- Dropped support for Python 3.8 and Django 3.2
+
+Changing it is kinda impossible right now. te xblock-sdk is using python 3.8 and django 3.2
+making packages and running dev.run raise error
+Requirement already satisfied: setuptools in /venvs/xblock-sdk/lib/python3.8/site-packages (from pip-tools==7.4.1->-r /usr/local/src/my-xblock/requirements/pip-tools.txt (line 13)) (44.0.0)
+INFO: pip is looking at multiple versions of botocore to determine which version is compatible with other requirements. This could take a while.
+ERROR: Cannot install -r /usr/local/src/my-xblock/requirements/quality.txt (line 31) and urllib3==2.2.2 because these package versions have conflicting dependencies.
+
+The conflict is caused by:
+    The user requested urllib3==2.2.2
+    botocore 1.34.152 depends on urllib3<1.27 and >=1.25.4; python_version < "3.10"
+
+To fix this you could try to:
+1. loosen the range of package versions you've specified
+2. remove package versions to allow pip to attempt to solve the dependency conflict
+
+ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/topics/dependency-resolution/#dealing-with-dependency-conflicts
+
+
 2024-05-25
 **********
 

README.rst

@@ -34,6 +34,7 @@ Using the cookiecutters
   # Set up a virtualenv using virtualenvwrapper with the same name as the repo and activate it
   mkvirtualenv -p python3.12 edx-cookiecutters
 
+
 2. Create a cookiecutter Repository
 ===================================
 
@@ -78,6 +79,7 @@ Directions for contributing to this repository
 
   # Set up a virtualenv using virtualenvwrapper with the same name as the repo and activate it
   mkvirtualenv -p python3.12 edx-cookiecutters
+
   # Activate the virtualenv
   workon edx-cookiecutters
 

cookiecutter-django-app/README.rst

@@ -54,7 +54,7 @@ Enter the project and take a look around:
     ls
 
 Generate a virtualenv and generate requirements files with dependencies
-pinned to current versions (make sure you're using pip 9.0.2+ and Python 3.8):
+pinned to current versions (make sure you're using pip 9.0.2+ and Python 3.11):
 
 .. code-block:: bash
 

cookiecutter-django-ida/README.rst

@@ -5,7 +5,7 @@ A cookiecutter_ template for Open edX Django projects.
 
 .. _cookiecutter: https://cookiecutter.readthedocs.org/en/latest/index.html
 
-**This template produces a Python 3.8 project.**
+**This template produces a Python 3.11 project.**
 
 This cookiecutter template is intended for new edX independently deployable apps (IDAs). It includes the following packages:
 

cookiecutter-django-ida/{{cookiecutter.repo_name}}/Dockerfile

@@ -21,7 +21,7 @@ FROM ubuntu:focal as app
 # If you add a package here please include a comment above describing what it is used for
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends \
  language-pack-en locales \
- python3.8 python3-dev python3-pip \
+ python3.11 python3-dev python3-pip \
  # The mysqlclient Python package has install-time dependencies
  libmysqlclient-dev libssl-dev pkg-config \
  gcc

cookiecutter-python-library/README.rst

@@ -5,7 +5,7 @@ A cookiecutter_ template for edX python projects. For django-related cookiecutte
 
 .. _cookiecutter: https://cookiecutter.readthedocs.org/en/latest/index.html
 
-**This template produces a Python 3.8 project.**
+**This template produces a Python 3.11 project.**
 
 This cookiecutter template is intended for new edX python libraries.
 

cookiecutter-xblock/{{cookiecutter.repo_name}}/README.rst

@@ -1,6 +1,9 @@
 {{cookiecutter.project_desc}}
 #############################
 
+
+TODO: Generate x.txt files in requirements with make upgrade
+
 Testing with Docker
 ********************
 
@@ -10,6 +13,25 @@ This XBlock comes with a Docker test environment ready to build, based on the xb
 
 The XBlock SDK Workbench, including this XBlock, will be available on the list of XBlocks at http://localhost:8000
 
+This command will build the Docker image if it doesn't exist, remove any existing containers, and start a new container in detached mode.4
+The container will be accessible on port 8000 of your local machine.
+
+To stop the running container, use::
+
+    $ make dev.stop
+
+If you need to run database migrations for your XBlock, you can do so with::
+
+    $ make dev.migrate
+
+This executes the migration command inside the running Docker container.
+
+To remove the Docker container and image, cleaning up all related resources, use::
+
+    $ make dev.clean
+
+These commands provide a streamlined workflow for building, running, and managing your XBlock's Docker test environment.
+
 Translating
 *************
 

cookiecutter-xblock/{{cookiecutter.repo_name}}/manage.py

@@ -13,7 +13,7 @@
 if __name__ == "__main__":
     os.environ.setdefault(
         "DJANGO_SETTINGS_MODULE",
-        "translation_settings"
+        "translation_settings",
     )
 
     execute_from_command_line(sys.argv)

cookiecutter-xblock/{{cookiecutter.repo_name}}/requirements/dev.in

@@ -1,6 +1,7 @@
 # Additional requirements for development of this application
 -c constraints.txt
 
+-r base.txt               # Base dependencies
 -r pip-tools.txt          # pip-tools and its dependencies, for managing requirements files
 -r quality.txt            # Core and quality check dependencies
 -r ci.txt                 # dependencies for setting up testing in CI

python-template/{{cookiecutter.placeholder_repo_name}}/setup.py

@@ -162,7 +162,7 @@ def package_data(pkg, roots):
 
     include_package_data=True,
     install_requires=load_requirements('requirements/base.in'),
-    python_requires=">=3.8",
+    python_requires=">=3.11",
 {%- if cookiecutter.open_source_license in license_classifiers %}
     license="{{ cookiecutter.open_source_license }}",
 {%- endif %}
@@ -172,7 +172,7 @@ def package_data(pkg, roots):
         'Development Status :: 3 - Alpha',
         {%- if cookiecutter.requires_django == "yes" %}
         'Framework :: Django',
-        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.2',
         {%- endif %}
         'Intended Audience :: Developers',
         {%- if cookiecutter.open_source_license == "AGPL 3.0" %}
@@ -184,7 +184,8 @@ def package_data(pkg, roots):
         {%- endif %}
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
 {%- if cookiecutter.setup_py_keyword_args != "None" %}
     {{ cookiecutter.setup_py_keyword_args }}