From: Oleg Broytman Date: Wed, 5 Nov 2025 15:44:36 +0000 (+0300) Subject: Evil PyPI forced to rename the subproject to `m_lib_full` X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=HEAD;p=m_lib_full.git Evil PyPI forced to rename the subproject to `m_lib_full` ...and `m_lib.defenc` to `m_lib_defenc`. --- diff --git a/.gitignore b/.gitignore index 9303ae4..aa68715 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /.cache/ /.tox/ -/m_lib.full.egg-info/ +/m_lib_full.egg-info/ /build/ /dist/ /MANIFEST diff --git a/INSTALL.txt b/INSTALL.txt index e07ff86..cd7f16b 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -m_lib.full requires Python 2.7 or 3.4+. +m_lib_full requires Python 2.7 or 3.4+. Installation script setup.py requires setuptools. @@ -6,15 +6,15 @@ Installation using pip: System-wide: - sudo pip install m_lib.full + sudo pip install m_lib_full User mode: - pip install --user m_lib.full + pip install --user m_lib_full Virtual environments: - pip install m_lib.full + pip install m_lib_full Installation from sources: @@ -28,6 +28,6 @@ Installation from sources: python setup.py install --user -Option '--user' installs m_lib.full into +Option '--user' installs m_lib_full into $HOME/.local/lib/python$MAJOR.$MINOR/site-packages/ where python finds it automatically. diff --git a/README.txt b/README.txt index 5424f06..231a0cc 100644 --- a/README.txt +++ b/README.txt @@ -4,8 +4,8 @@ Copyright (C) 1996-2025 PhiloSoft Design. License: GPL. This a full namespace meta-package that installs all parts of m_lib library -(currently m_lib and m_lib.defenc). +(currently m_lib and m_lib_defenc). :: - pip install m_lib.full + pip install m_lib_full diff --git a/devscripts/release b/devscripts/release index 23b27dc..26be130 100755 --- a/devscripts/release +++ b/devscripts/release @@ -9,15 +9,8 @@ python setup.py build_py && python setup.py build && python setup.py sdist && -rv=$(python setup.py --version) -if [ -f dist/m_lib.full-$rv.tar.gz ]; then - cd dist && - mv m_lib.full-$rv.tar.gz m_lib_full-$rv.tar.gz && - cd .. -fi && - find build -name '*.py[co]' -delete && python setup.py bdist_wheel --universal && twine upload --disable-progress-bar --skip-existing dist/* && -exec rm -rf build dist m_lib.full.egg-info +exec rm -rf build dist m_lib_full.egg-info diff --git a/mk-distr b/mk-distr index 4dfc4b3..08eca41 100755 --- a/mk-distr +++ b/mk-distr @@ -2,9 +2,9 @@ umask 022 && -git archive --format=tar --prefix=m_lib.full/ "${1:-HEAD}" | +git archive --format=tar --prefix=m_lib_full/ "${1:-HEAD}" | (cd "$HOME/tmp" && exec tar xf -) && -cd "$HOME/tmp/m_lib.full" && +cd "$HOME/tmp/m_lib_full" && python setup.py sdist --formats=bztar && -cd dist && mv m_lib.full-*.tar.bz2 ../.. && cd ../.. && exec rm -rf m_lib.full +cd dist && mv m_lib_full-*.tar.bz2 ../.. && cd ../.. && exec rm -rf m_lib_full diff --git a/requirements.txt b/requirements.txt index 252eb0a..10f4a3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -m_lib >= 3.1.0.post2 -m_lib.defenc >= 1.1.0.post1 +m_lib >= 3.1.2 +m_lib_defenc >= 1.1.1 diff --git a/setup.py b/setup.py index 3a61ecd..b815b17 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup setup( - name = "m_lib.full", + name = "m_lib_full", version = "1.0.2", description = "m_lib full meta-package", long_description = "Broytman Library for Python, Copyright (C) 1996-2025 PhiloSoft Design", @@ -13,8 +13,8 @@ setup( url = "https://phdru.name/Software/Python/#m_lib", project_urls={ 'Homepage': 'https://phdru.name/Software/Python/#m_lib', - 'Download': 'https://pypi.org/project/m_lib.full/', - 'Git repo': 'https://git.phdru.name/m_lib.full.git/', + 'Download': 'https://pypi.org/project/m_lib_full/', + 'Git repo': 'https://git.phdru.name/m_lib_full.git/', }, license = "GPL", classifiers=[ @@ -43,5 +43,5 @@ setup( packages = ["m_lib"], namespace_packages = ["m_lib"], python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', - install_requires=['m_lib>=3.1.0.post1', 'm_lib.defenc>=1.1'], + install_requires=['m_lib>=3.1.2', 'm_lib_defenc>=1.1.1'], )