Build: Remove duplicate `requirements.txt`

diff --git a/INSTALL.txt b/INSTALL.txt
index 37b96b63069fd10af98481d327a9e54044832951..e07ff86dfad4815a11e006512a9af0dc2dedd8e0 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-m_lib.full requires Python 2.6 (that means pip >= 9, < 10), 2.7 or 3.4+.
+m_lib.full requires Python 2.7 or 3.4+.
 
 Installation script setup.py requires setuptools.
 
@@ -16,8 +16,6 @@ Installation using pip:
 
     pip install m_lib.full
 
-    For Python 2.6 the command is easy_install.
-
 Installation from sources:
 
     To install the library from sources system-wide run run the following

diff --git a/README.txt b/README.txt
index b736eebb4b00d3ff164f8c73c91b1f4898fa7504..71b4a25adc6fe7664f2f3e261bfdb5316232067b 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,11 @@
 Broytman Library for Python.
 Author: Oleg Broytman <phd@phdru.name>.
-Copyright (C) 1996-2018 PhiloSoft Design.
+Copyright (C) 1996-2023 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).
+
+::
+
+    pip install m_lib.full

diff --git a/devscripts/release b/devscripts/release
index c5753b27b1c29893d88e395eceee2217cfcfd8ea..d94c27f69133ca6c906527722f5e0b35803b0dd7 100755 (executable)
--- a/devscripts/release
+++ b/devscripts/release
@@ -12,5 +12,5 @@ python setup.py sdist &&
 find build -name '*.py[co]' -delete &&
 python setup.py bdist_wheel --universal &&
 
-twine upload --skip-existing dist/* &&
+twine upload --disable-progress-bar --skip-existing dist/* &&
 exec rm -rf build dist m_lib.full.egg-info

diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt
deleted file mode 100644 (file)
index 731a639..0000000
--- a/devscripts/requirements/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
---install-option=-O2
-
-m_lib>=3.1
-m_lib.defenc>=1.0

diff --git a/m_lib/__init__.py b/m_lib/__init__.py
index 943eda83c2cd76b0f2617869e7a3cf66a8668cde..e96843970f2e0f43897ef9c041f7373d7f04bdd4 100644 (file)
--- a/m_lib/__init__.py
+++ b/m_lib/__init__.py
@@ -1,5 +1,8 @@
-"""Broytman Library for Python, Copyright (C) 1996-2018 PhiloSoft Design"""
+"""Broytman Library for Python, Copyright (C) 1996-2023 PhiloSoft Design"""
 
 from pkgutil import extend_path
+import sys
+
 __path__ = extend_path(__path__, __name__)
-__import__('pkg_resources').declare_namespace(__name__)
+if sys.version_info < (3, 7):
+    __import__('pkg_resources').declare_namespace(__name__)

diff --git a/requirements.txt b/requirements.txt
index d9de3b6e6ec0145d707b77dd3c44b095f29ec7df..252eb0a5c7ae0daef361b9c2c8d489879f9e5575 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,2 @@
---install-option=-O2
-
-m_lib
-m_lib.defenc
+m_lib >= 3.1.0.post2
+m_lib.defenc >= 1.1.0.post1

diff --git a/setup.py b/setup.py
index 7ce033dc7cce8df07338d5645eff7aebd81e4788..1c21cfdc499a350ef2ddc8687f1eb8efddcd612d 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,9 @@ from setuptools import setup
 
 setup(
     name = "m_lib.full",
-    version = "1.0.1",
+    version = "1.0.1.post2",
     description = "m_lib full meta-package",
-    long_description = "Broytman Library for Python, Copyright (C) 1996-2018 PhiloSoft Design",
+    long_description = "Broytman Library for Python, Copyright (C) 1996-2023 PhiloSoft Design",
     long_description_content_type="text/plain",
     author = "Oleg Broytman",
     author_email = "phd@phdru.name",
@@ -23,19 +23,23 @@ setup(
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     platforms = "Any",
     packages = ["m_lib"],
     namespace_packages = ["m_lib"],
-    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
-    install_requires=['m_lib>=3.1', 'm_lib.defenc>=1.0'],
+    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'],
 )