markdown-xblock 2.1.0__tar.gz → 2.3.0__tar.gz

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.1.0
+current_version = 2.3.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<rc>\d+))?
 serialize = 
 	{major}.{minor}.{patch}rc{rc}

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/HACKING.md

@@ -56,12 +56,12 @@ Push these two commits (the one for the changelog, and the version
 bump) to `origin`. Make sure you push the `v<num>` tag to `origin` as
 well.
 
-Then, build a new `sdist` package, and [upload it to
+Then, build a new `sdist` package (with [build](https://pypi.org/project/build/)), and [upload it to
 PyPI](https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives)
 (with [twine](https://packaging.python.org/key_projects/#twine)):
 
 ```bash
 rm dist/* -f
-./setup.py sdist
+python -m build --sdist
 twine upload dist/*
 ```

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/PKG-INFO

@@ -1,21 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: markdown-xblock
-Version: 2.1.0
+Version: 2.3.0
 Summary: Markdown XBlock provides editing course content in Markdown.
-Home-page: https://github.com/citynetwork/xblock-markdown
-License: AGPL-3.0
+License-Expression: AGPL-3.0-only
+Project-URL: Repository, https://github.com/cleura/markdown-xblock
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Django
 Classifier: Intended Audience :: Education
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Topic :: Education :: Computer Aided Instruction (CAI)
 Classifier: Topic :: Education
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: XBlock<5
+Requires-Dist: XBlock<5.3,>=5.2
 Requires-Dist: markdown2>=2.3.9
 Requires-Dist: Pygments>=2.0.1
+Requires-Dist: lxml-html-clean>=0.4.3
+Dynamic: license-file
 
 [![PyPI version](https://badge.fury.io/py/markdown-xblock.svg)](https://pypi.python.org/pypi/markdown-xblock)
 
@@ -30,13 +31,13 @@ and displays it as HTML.
 You may install the markdown-xblock to your Tutor environment by adding it to the `OPENEDX_EXTRA_PIP_REQUIREMENTS` list in `config.yml`:
 ```
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
-- markdown-xblock==2.1.0
+- markdown-xblock==2.3.0
 ```
 
 Or, if you prefer to install directly from Git:
 ```
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
-- git+https://github.com/citynetwork/markdown-xblock.git@v2.1.0
+- git+https://github.com/cleura/markdown-xblock.git@v2.3.0
 ```
 For additional information, please refer to the official [documentation](https://docs.tutor.edly.io/configuration.html#open-edx-customisation).
 

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/README.md

@@ -11,13 +11,13 @@ and displays it as HTML.
 You may install the markdown-xblock to your Tutor environment by adding it to the `OPENEDX_EXTRA_PIP_REQUIREMENTS` list in `config.yml`:
 ```
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
-- markdown-xblock==2.1.0
+- markdown-xblock==2.3.0
 ```
 
 Or, if you prefer to install directly from Git:
 ```
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
-- git+https://github.com/citynetwork/markdown-xblock.git@v2.1.0
+- git+https://github.com/cleura/markdown-xblock.git@v2.3.0
 ```
 For additional information, please refer to the official [documentation](https://docs.tutor.edly.io/configuration.html#open-edx-customisation).
 

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/markdown_xblock.egg-info/PKG-INFO

@@ -1,21 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: markdown-xblock
-Version: 2.1.0
+Version: 2.3.0
 Summary: Markdown XBlock provides editing course content in Markdown.
-Home-page: https://github.com/citynetwork/xblock-markdown
-License: AGPL-3.0
+License-Expression: AGPL-3.0-only
+Project-URL: Repository, https://github.com/cleura/markdown-xblock
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Django
 Classifier: Intended Audience :: Education
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Topic :: Education :: Computer Aided Instruction (CAI)
 Classifier: Topic :: Education
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: XBlock<5
+Requires-Dist: XBlock<5.3,>=5.2
 Requires-Dist: markdown2>=2.3.9
 Requires-Dist: Pygments>=2.0.1
+Requires-Dist: lxml-html-clean>=0.4.3
+Dynamic: license-file
 
 [![PyPI version](https://badge.fury.io/py/markdown-xblock.svg)](https://pypi.python.org/pypi/markdown-xblock)
 
@@ -30,13 +31,13 @@ and displays it as HTML.
 You may install the markdown-xblock to your Tutor environment by adding it to the `OPENEDX_EXTRA_PIP_REQUIREMENTS` list in `config.yml`:
 ```
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
-- markdown-xblock==2.1.0
+- markdown-xblock==2.3.0
 ```
 
 Or, if you prefer to install directly from Git:
 ```
 OPENEDX_EXTRA_PIP_REQUIREMENTS:
-- git+https://github.com/citynetwork/markdown-xblock.git@v2.1.0
+- git+https://github.com/cleura/markdown-xblock.git@v2.3.0
 ```
 For additional information, please refer to the official [documentation](https://docs.tutor.edly.io/configuration.html#open-edx-customisation).
 

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/markdown_xblock.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ HACKING.md
 LICENSE
 README.md
 manage.py
+pyproject.toml
 requirements.txt
 setup.py
 tox.ini

markdown_xblock-2.3.0/markdown_xblock.egg-info/requires.txt

@@ -0,0 +1,4 @@
+XBlock<5.3,>=5.2
+markdown2>=2.3.9
+Pygments>=2.0.1
+lxml-html-clean>=0.4.3

markdown_xblock-2.3.0/markdown_xblock.egg-info/top_level.txt

@@ -0,0 +1,6 @@
+dist
+markdown_xblock
+releasenotes
+requirements
+tests
+var

markdown_xblock-2.3.0/pyproject.toml

@@ -0,0 +1,42 @@
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-scm[toml]>=7"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "markdown-xblock"
+dynamic = ["version"]
+dependencies = [
+    "XBlock>=5.2,<5.3",
+    "markdown2>=2.3.9",
+    "Pygments>=2.0.1",
+    "lxml-html-clean>=0.4.3"
+]
+requires-python = ">=3.11"
+description = "Markdown XBlock provides editing course content in Markdown."
+readme = {file = "README.md", content-type = "text/markdown"}
+license = "AGPL-3.0-only"
+license-files = ["LICENSE"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Framework :: Django",
+    "Intended Audience :: Education",
+    "Topic :: Education :: Computer Aided Instruction (CAI)",
+    "Topic :: Education",
+]
+
+[project.urls]
+Repository = "https://github.com/cleura/markdown-xblock"
+
+[project.entry-points."xblock.v1"]
+markdown = "markdown_xblock:MarkdownXBlock"
+
+[tool.setuptools_scm]
+
+[tool.setuptools]
+packages = { find = {} }
+
+[tool.setuptools.package-data]
+markdown_xblock = [
+  "static/**",
+  "public/**"
+]

markdown_xblock-2.3.0/requirements/base.txt

@@ -0,0 +1,10 @@
+# Requirements for app run
+
+xblock-sdk
+django-statici18n<=2.6.0
+edx-i18n-tools<=1.9
+Mako<=1.3.10
+bleach<=6.3.0
+lxml-html-clean>=0.4.3
+django<=5.2
+markdown2>=2.5.4

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/requirements/test.txt

@@ -10,6 +10,6 @@ tox-battery==0.6.0
 mock==3.0.5
 
 # Github requirements
-django-pyfs<3.2
+openedx-django-pyfs>=3.8.0
 xblock-sdk<0.9.0;python_version<"3.9"
 xblock-sdk;python_version>="3.9"

markdown_xblock-2.3.0/setup.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+"""Setup for hastexo XBlock."""
+
+from setuptools import setup
+
+setup()

{markdown_xblock-2.1.0 → markdown_xblock-2.3.0}/tests/test_basics.py

@@ -185,9 +185,8 @@ class TestMarkdownXBlock(unittest.TestCase):
         with patch('markdown_xblock.html.get_xblock_settings') as get_settings_mock:
             get_settings_mock.return_value = settings
             fragment = block.student_view()
-            # in replace mode, "+" in URLs turns into whitespace
             self.assertIn(
-                '<a href="https://test.com/courses/course-v1:Org Class Version/about">test1</a>',
+                '<a href="https://test.com/courses/course-v1:Org+Class+Version/about">test1</a>',
                 fragment.content
             )
             self.assertIn(
@@ -210,9 +209,8 @@ class TestMarkdownXBlock(unittest.TestCase):
         with patch('markdown_xblock.html.get_xblock_settings') as get_settings_mock:
             get_settings_mock.return_value = settings
             fragment = block.student_view()
-            # in escape mode, "+" in URLs turns into whitespace
             self.assertIn(
-                '<a href="https://test.com/courses/course-v1:Org Class Version/about">test1</a>',
+                '<a href="https://test.com/courses/course-v1:Org+Class+Version/about">test1</a>',
                 fragment.content
             )
             self.assertIn(

markdown_xblock-2.1.0/markdown_xblock.egg-info/requires.txt

@@ -1,3 +0,0 @@
-XBlock<5
-markdown2>=2.3.9
-Pygments>=2.0.1

markdown_xblock-2.1.0/markdown_xblock.egg-info/top_level.txt

@@ -1 +0,0 @@
-markdown_xblock

markdown_xblock-2.1.0/requirements/base.txt

@@ -1,8 +0,0 @@
-# Requirements for app run
-
-xblock-sdk
-django-statici18n<2.6
-edx-i18n-tools<1.6
-Mako==1.3.6
-bleach<=6.1.0
-django<=4.3

markdown_xblock-2.1.0/setup.py

@@ -1,58 +0,0 @@
-"""Setup for Markdown XBlock."""
-
-import os
-
-from setuptools import setup
-
-
-def package_data(pkg, roots):
-    """Generic function to find package_data.
-
-    All of the files under each of the `roots` will be declared as package
-    data for package `pkg`.
-
-    """
-    data = []
-    for root in roots:
-        for dirname, _, files in os.walk(os.path.join(pkg, root)):
-            for fname in files:
-                data.append(os.path.relpath(os.path.join(dirname, fname), pkg))
-
-    return {pkg: data}
-
-
-setup(
-    name='markdown-xblock',
-    use_scm_version=True,
-    description='Markdown XBlock provides editing course content in Markdown.',
-    long_description=open('README.md').read(),
-    long_description_content_type='text/markdown',
-    url='https://github.com/citynetwork/xblock-markdown',
-    license='AGPL-3.0',
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Framework :: Django',
-        'Intended Audience :: Education',
-        'License :: OSI Approved :: GNU Affero General Public License v3',
-        'Topic :: Education :: Computer Aided Instruction (CAI)',
-        'Topic :: Education',
-    ],
-    packages=[
-        'markdown_xblock',
-    ],
-    python_requires='>=3.11',
-    install_requires=[
-        'XBlock<5',
-        'markdown2>=2.3.9',
-        'Pygments>=2.0.1',
-    ],
-    setup_requires=[
-        'setuptools-scm',
-    ],
-    entry_points={
-        'xblock.v1': [
-            'markdown = markdown_xblock:MarkdownXBlock'
-        ]
-    },
-    package_data=package_data("markdown_xblock", ["static", "public"]),
-)