PyPI - edu-rdm-integration - Versions diffs - 3.5.8__tar.gz → 3.5.10__tar.gz - Mend

edu-rdm-integration 3.5.8tar.gz → 3.5.10tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (210) hide show

{edu-rdm-integration-3.5.8 → edu_rdm_integration-3.5.10}/CHANGELOG.md RENAMED Viewed

@@ -28,6 +28,23 @@
 ### Удалено
+## [3.5.10] - 2025-03-24
+### Изменено
+- [EDUDEVOPS-66](https://jira.bars.group/browse/EDUDEVOPS-66)
+  PATCH Переход на pyproject.toml.
+## [3.5.9] - 2025-03-14
+### Изменено
+- [EDUDEVOPS-66](https://jira.bars.group/browse/EDUDEVOPS-66)
+  PATCH Исправление сборки.
 ## [3.5.8] - 2025-03-13
 ### Изменено

edu_rdm_integration-3.5.10/MANIFEST.in ADDED Viewed

@@ -0,0 +1,9 @@
+graft src
+global-exclude *.pyc
+global-exclude __pycache__
+include LICENSE
+include CHANGELOG.md
+include CONDUCT.md
+include README.md

{edu-rdm-integration-3.5.8 → edu_rdm_integration-3.5.10}/PKG-INFO RENAMED Viewed

@@ -1,15 +1,46 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.5.8
+Version: 3.5.10
 Summary: Интеграция с Региональной витриной данных
-Home-page:
-Download-URL:
-Author: BARS Group
-Author-email: bars@bars.group
-Platform: Any
+Author-email: BARS Group <education_dev@bars.group>
+Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu_rdm_integration/browse
+Project-URL: Repository, https://stash.bars-open.ru/scm/edubase/edu_rdm_integration.git
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Framework :: Django :: 2.2
+Classifier: Framework :: Django :: 3.0
+Classifier: Framework :: Django :: 3.1
+Classifier: Framework :: Django :: 3.2
+Classifier: Intended Audience :: Developers
+Classifier: Environment :: Web Environment
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: transliterate<2
+Requires-Dist: Django<3.3,>=3.1
+Requires-Dist: celery<5.3,>=4.4.7
+Requires-Dist: asyncpg==0.23.0
+Requires-Dist: educommon<4,>=3.11.0
+Requires-Dist: function-tools<1,>=0.9.0
+Requires-Dist: m3-db-utils<1,>=0.3.10
+Requires-Dist: m3-django-compat<2,>=1.10.2
+Requires-Dist: uploader-client<1,>=0.2.3
+Provides-Extra: dev
+Requires-Dist: isort==5.12.0; extra == "dev"
+Requires-Dist: ruff==0.6.9; extra == "dev"
+Requires-Dist: flake8<7,>=4.0.1; extra == "dev"
+Requires-Dist: pytest<8,>=3.2.5; extra == "dev"
+Requires-Dist: pytest-cov<5; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx<7.5,>=7; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints<2.5,>=2; extra == "docs"
+Requires-Dist: myst-parser<3.2,>=3; extra == "docs"
+Requires-Dist: sphinx_design<0.7,>=0.6; extra == "docs"
+Dynamic: license-file
 # Проект "Интеграция с Региональной витриной данных (РВД)"

edu_rdm_integration-3.5.10/pyproject.toml ADDED Viewed

@@ -0,0 +1,133 @@
+[build-system]
+requires = [
+    'packaging>=24,<25',
+    'wheel>=0.45,<0.46',
+    'setuptools>=77,<78',
+    'setuptools-git-versioning>=2,<3',
+]
+build-backend = 'setuptools.build_meta'
+[project]
+name = 'edu-rdm-integration'
+description = 'Интеграция с Региональной витриной данных'
+license-files = ['LICENSE']
+authors = [
+  {name = 'BARS Group', email = 'education_dev@bars.group'},
+]
+readme = 'README.md'
+requires-python = '>=3.9'
+dependencies = [
+    'transliterate<2',
+    'Django>=3.1,<3.3',
+    'celery>=4.4.7,<5.3',
+    'asyncpg==0.23.0',
+    'educommon>=3.11.0,<4',
+    'function-tools>=0.9.0,<1',
+    'm3-db-utils>=0.3.10,<1',
+    'm3-django-compat>=1.10.2,<2',
+    'uploader-client>=0.2.3,<1',
+]
+classifiers=[
+    'Development Status :: 5 - Production/Stable',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Framework :: Django :: 2.2',
+    'Framework :: Django :: 3.0',
+    'Framework :: Django :: 3.1',
+    'Framework :: Django :: 3.2',
+    'Intended Audience :: Developers',
+    'Environment :: Web Environment',
+]
+dynamic = ['version']
+[project.urls]
+Homepage = 'https://stash.bars-open.ru/projects/EDUBASE/repos/edu_rdm_integration/browse'
+Repository = 'https://stash.bars-open.ru/scm/edubase/edu_rdm_integration.git'
+[project.optional-dependencies]
+dev = [
+    'isort==5.12.0',
+    'ruff==0.6.9',
+    'flake8>=4.0.1,<7',
+    'pytest>=3.2.5,<8',
+    'pytest-cov<5',
+]
+docs = [
+    'sphinx>=7,<7.5',
+    'sphinx-autodoc-typehints>=2,<2.5',
+    'myst-parser>=3,<3.2',
+    'sphinx_design>=0.6,<0.7',
+]
+[tool.setuptools.packages.find]
+where = ['src']
+[tool.setuptools.package-data]
+edu_rdm_integration = ['*.py-tpl', '*.js']
+[tool.setuptools.exclude-package-data]
+edu_rdm_integration = ['tests', 'tests.*']
+[tool.setuptools-git-versioning]
+enabled = true
+[tool.ruff]
+line-length = 120
+indent-width = 4
+target-version = 'py312'
+[tool.ruff.format]
+quote-style = 'single'
+indent-style = 'space'
+docstring-code-format = true
+[tool.flake8]
+max-line-length = 120
+ignore = [
+    # Missing docstring in public module
+    'D100',
+    # Missing docstring in public package
+    'D104',
+    # Missing docstring in public nested class
+    'D106',
+    # Missing docstring in __init__
+    'D107',
+    # One-line docstring should fit on one line with quotes
+    'D200',
+    # Line break before binary operator
+    'W503',
+    # use of assert detected (useless with pytest)
+    'S101',
+]
+per-file-ignores = [
+  # variable '...' in class scope should not be mixedCase
+  # В SOAP моделях могут использоваться имена с различным написанием
+  'wsmodel.py:N815',
+  # function name '...' should be lowercase
+  # SOAP методы могут именоваться разными способами
+  'wsapi.py:N802,N815',
+]
+exclude = [
+  'venv',
+]
+max-complexity = 10
+[tool.pylint]
+score = 'no'
+msg-template = '{path}:{line} {msg} ({symbol})'
+disable = 'all'
+enable = [
+    'import-error',
+    'no-name-in-module',
+    'undefined-variable',
+    'undefined-all-variable',
+]
+extension-pkg-whitelist = [
+    'lxml',
+]

edu_rdm_integration-3.5.10/setup.cfg ADDED Viewed

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build =
+tag_date = 0

{edu-rdm-integration-3.5.8 → edu_rdm_integration-3.5.10}/src/edu_rdm_integration.egg-info/PKG-INFO RENAMED Viewed

@@ -1,15 +1,46 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.5.8
+Version: 3.5.10
 Summary: Интеграция с Региональной витриной данных
-Home-page:
-Download-URL:
-Author: BARS Group
-Author-email: bars@bars.group
-Platform: Any
+Author-email: BARS Group <education_dev@bars.group>
+Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu_rdm_integration/browse
+Project-URL: Repository, https://stash.bars-open.ru/scm/edubase/edu_rdm_integration.git
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Framework :: Django :: 2.2
+Classifier: Framework :: Django :: 3.0
+Classifier: Framework :: Django :: 3.1
+Classifier: Framework :: Django :: 3.2
+Classifier: Intended Audience :: Developers
+Classifier: Environment :: Web Environment
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: transliterate<2
+Requires-Dist: Django<3.3,>=3.1
+Requires-Dist: celery<5.3,>=4.4.7
+Requires-Dist: asyncpg==0.23.0
+Requires-Dist: educommon<4,>=3.11.0
+Requires-Dist: function-tools<1,>=0.9.0
+Requires-Dist: m3-db-utils<1,>=0.3.10
+Requires-Dist: m3-django-compat<2,>=1.10.2
+Requires-Dist: uploader-client<1,>=0.2.3
+Provides-Extra: dev
+Requires-Dist: isort==5.12.0; extra == "dev"
+Requires-Dist: ruff==0.6.9; extra == "dev"
+Requires-Dist: flake8<7,>=4.0.1; extra == "dev"
+Requires-Dist: pytest<8,>=3.2.5; extra == "dev"
+Requires-Dist: pytest-cov<5; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx<7.5,>=7; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints<2.5,>=2; extra == "docs"
+Requires-Dist: myst-parser<3.2,>=3; extra == "docs"
+Requires-Dist: sphinx_design<0.7,>=0.6; extra == "docs"
+Dynamic: license-file
 # Проект "Интеграция с Региональной витриной данных (РВД)"

{edu-rdm-integration-3.5.8 → edu_rdm_integration-3.5.10}/src/edu_rdm_integration.egg-info/SOURCES.txt RENAMED Viewed

@@ -4,18 +4,6 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-setup.cfg
-setup.py
-requirements/development.txt
-requirements/production.txt
-requirements/stage.txt
-requirements/dependencies/development_packages.txt
-requirements/dependencies/external_packages.txt
-requirements/dependencies/internal_packages.txt
-requirements/dependencies/internal_sources.txt
-requirements/dependencies/production_packages.txt
-requirements/dependencies/system_packages.txt
-requirements/dependencies/testing_packages.txt
 src/edu_rdm_integration/__init__.py
 src/edu_rdm_integration/app_meta.py
 src/edu_rdm_integration/app_settings.py
@@ -36,8 +24,7 @@ src/edu_rdm_integration/utils.py
 src/edu_rdm_integration.egg-info/PKG-INFO
 src/edu_rdm_integration.egg-info/SOURCES.txt
 src/edu_rdm_integration.egg-info/dependency_links.txt
-src/edu_rdm_integration.egg-info/namespace_packages.txt
-src/edu_rdm_integration.egg-info/not-zip-safe
+src/edu_rdm_integration.egg-info/requires.txt
 src/edu_rdm_integration.egg-info/top_level.txt
 src/edu_rdm_integration/adapters/__init__.py
 src/edu_rdm_integration/adapters/apps.py

edu_rdm_integration-3.5.10/src/edu_rdm_integration.egg-info/requires.txt ADDED Viewed

@@ -0,0 +1,22 @@
+transliterate<2
+Django<3.3,>=3.1
+celery<5.3,>=4.4.7
+asyncpg==0.23.0
+educommon<4,>=3.11.0
+function-tools<1,>=0.9.0
+m3-db-utils<1,>=0.3.10
+m3-django-compat<2,>=1.10.2
+uploader-client<1,>=0.2.3
+[dev]
+isort==5.12.0
+ruff==0.6.9
+flake8<7,>=4.0.1
+pytest<8,>=3.2.5
+pytest-cov<5
+[docs]
+sphinx<7.5,>=7
+sphinx-autodoc-typehints<2.5,>=2
+myst-parser<3.2,>=3
+sphinx_design<0.7,>=0.6

edu-rdm-integration-3.5.8/MANIFEST.in DELETED Viewed

@@ -1,10 +0,0 @@
-global-exclude *.pyc
-recursive-include src *.js
-recursive-include src *.py
-recursive-include src *.py-tpl
-recursive-include requirements *.txt
-include LICENSE
-include setup.py
-include CHANGELOG.md
-include CONDUCT.md
-include README.md

edu-rdm-integration-3.5.8/pyproject.toml DELETED Viewed

@@ -1,19 +0,0 @@
-[build-system]
-requires = [
-    "packaging>=21.3,<24",
-    "setuptools>=47.3.1,<70",
-    "wheel>=0.37.1,<0.42",
-    "pip>=23.2.1,<24",
-    "setuptools-git-versioning>=2.0,<3"
-]
-build-backend = "setuptools.build_meta"
-[tool.setuptools-git-versioning]
-enabled = true
-[project]
-name = "edu-rdm-integration"
-dynamic = ["version"]
-description = "Интеграция с Региональной витриной данных"
-readme = "README.md"
-requires-python = ">= 3.9"

edu-rdm-integration-3.5.8/requirements/dependencies/development_packages.txt DELETED Viewed

@@ -1,5 +0,0 @@
-isort>=5.10.1,<6
-flake8>=4.0.1,<7
-pytest>=3.2.5,<8
-pytest-cov<5
-python-semantic-release<9

edu-rdm-integration-3.5.8/requirements/dependencies/external_packages.txt DELETED Viewed

@@ -1,4 +0,0 @@
-transliterate<2
-Django>=3.1,<3.3
-celery>=4.4.7,<5.3
-asyncpg==0.23.0

edu-rdm-integration-3.5.8/requirements/dependencies/internal_packages.txt DELETED Viewed

@@ -1,5 +0,0 @@
-educommon>=3.11.0,<4
-function-tools>=0.9.0,<1
-m3-db-utils>=0.3.10,<1
-m3-django-compat>=1.10.2,<2
-uploader-client>=0.2.3,<1

edu-rdm-integration-3.5.8/requirements/dependencies/internal_sources.txt DELETED Viewed

@@ -1,4 +0,0 @@
--e git+ssh://git@stash.bars-open.ru:7999/edubase/educommon.git@release/3.11#egg=educommon
--e git+ssh://git@stash.bars-open.ru:7999/m3/function-tools.git@release/0.9#egg=function_tools
--e git+ssh://git@stash.bars-open.ru:7999/m3/m3_db_utils.git@release/0.3#egg=m3_db_utils
--e git+ssh://git@stash.bars-open.ru:7999/eduschl/uploader-client.git@release/0.2#egg=uploader-client

edu-rdm-integration-3.5.8/requirements/dependencies/production_packages.txt DELETED Viewed

	@@ -1,2 +0,0 @@
1	- -r external_packages.txt
2	- -r internal_packages.txt

edu-rdm-integration-3.5.8/requirements/dependencies/system_packages.txt DELETED Viewed

@@ -1,4 +0,0 @@
-packaging>=21.3,<24
-pip>=23.2.1,<24
-setuptools>=47.3.1,<70
-wheel>=0.37.1,<0.42

edu-rdm-integration-3.5.8/requirements/dependencies/testing_packages.txt DELETED Viewed

File without changes

edu-rdm-integration-3.5.8/requirements/development.txt DELETED Viewed

@@ -1,5 +0,0 @@
--r dependencies/system_packages.txt
--r dependencies/external_packages.txt
--r dependencies/internal_sources.txt
--r dependencies/development_packages.txt
--r dependencies/testing_packages.txt

edu-rdm-integration-3.5.8/requirements/production.txt DELETED Viewed

	@@ -1,2 +0,0 @@
1	- -r dependencies/system_packages.txt
2	- -r dependencies/production_packages.txt

edu-rdm-integration-3.5.8/requirements/stage.txt DELETED Viewed

@@ -1,5 +0,0 @@
--r dependencies/system_packages.txt
--r dependencies/external_packages.txt
--r dependencies/internal_packages.txt
--r dependencies/testing_packages.txt
--r dependencies/development_packages.txt

edu-rdm-integration-3.5.8/setup.cfg DELETED Viewed

@@ -1,36 +0,0 @@
-[metadata]
-description-file = README.md
-[flake8]
-max-line-length = 120
-ignore =
-	D100,
-	D104,
-	D106,
-	D107,
-	D200,
-	W503,
-	S101,
-per-file-ignores =
-	wsmodel.py:N815
-	wsapi.py:N802,N815
-exclude =
-	venv,
-max-complexity = 10
-[pylint]
-score = no
-msg-template = {path}:{line} {msg} ({symbol})
-disable = all
-enable =
-	import-error,
-	no-name-in-module,
-	undefined-variable,
-	undefined-all-variable,
-extension-pkg-whitelist =
-	lxml,
-[egg_info]
-tag_build =
-tag_date = 0

edu-rdm-integration-3.5.8/setup.py DELETED Viewed

@@ -1,110 +0,0 @@
-from codecs import (
-    open,
-)
-from pathlib import (
-    Path,
-)
-import pip
-from packaging.version import (
-    Version,
-)
-from setuptools import (
-    find_packages,
-    setup,
-)
-PROJECT = 'edu_rdm_integration'
-current_dir_path = Path().resolve()
-#  Получение полного описания
-with open(str(current_dir_path / 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
-with open(str(current_dir_path / 'CHANGELOG.md'), encoding='utf-8') as f:
-    long_description += f.read()
-production_requirements_path = current_dir_path / 'requirements' / 'production.txt'
-if hasattr(pip, '__version__') and Version(str(pip.__version__)) >= Version('20'):
-    from pip._internal.network.session import (
-        PipSession,
-    )
-    from pip._internal.req import (
-        parse_requirements,
-    )
-    requirements = parse_requirements(str(production_requirements_path), session=PipSession())
-elif (
-    hasattr(pip, '__version__')
-    and Version('10.0.0') <= Version(str(pip.__version__)) <= Version('19.3.1')
-):
-    from pip._internal import (
-        download,
-        req,
-    )
-    requirements = req.parse_requirements(str(production_requirements_path), session=download.PipSession())
-elif hasattr(pip, '__version__') and Version(str(pip.__version__)) >= Version('7.0'):
-    requirements = pip.req.parse_requirements(str(production_requirements_path), session=pip.download.PipSession())
-else:
-    requirements = pip.req.parse_requirements(str(production_requirements_path))
-install_requires = [str(item.requirement) for item in requirements]
-setup(
-    name=PROJECT.replace('_', '-'),
-    description='Интеграция с Региональной витриной данных',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    author='BARS Group',
-    author_email='bars@bars.group',
-    url='',
-    download_url='',
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
-        'Intended Audience :: Developers',
-        'Environment :: Console',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
-    ],
-    platforms=['Any'],
-    scripts=[],
-    provides=[],
-    namespace_packages=[],
-    package_dir={'': 'src'},
-    packages=find_packages('src', exclude=('tests', 'tests.*')),
-    include_package_data=True,
-    package_data={
-        '': [
-            '*.conf',
-            '*.tmpl',
-            '*.sh',
-            'Dockerfile',
-            '*.yaml',
-        ],
-    },
-    install_requires=install_requires,
-    zip_safe=False,
-)