From: Oleg Broytman <phd@phdru.name>
Date: Thu, 14 Dec 2023 15:07:05 +0000 (+0300)
Subject: Release 3.1.0.post2: Tested with Python 3.12
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6cf19b1dd926e0052bb618bf704938be6a8e9f92;p=m_lib.git

Release 3.1.0.post2: Tested with Python 3.12
---

diff --git a/INSTALL.txt b/INSTALL.txt
index 8a87ed0..6b743d9 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-m_lib requires Python 2.6 (that means pip >= 9, < 10), 2.7 or 3.4+.
+m_lib requires Python 2.7 or 3.4+.
 
 Installation script setup.py requires setuptools.
 
@@ -16,7 +16,7 @@ Installation using pip:
 
     pip install m_lib
 
-    For Python 2.6 the command is easy_install.
+    For Python 2.7 the command is easy_install.
 
 Installation from sources:
 
diff --git a/README.txt b/README.txt
index e42e85d..a35005e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 Broytman Library for Python.
 Author: Oleg Broytman <phd@phdru.name>.
-Copyright (C) 1996-2018 PhiloSoft Design.
+Copyright (C) 1996-2023 PhiloSoft Design.
 License: GPL.
 
 For installation instruction see INSTALL.txt.
diff --git a/m_lib/__init__.py b/m_lib/__init__.py
index 943eda8..e968439 100644
--- 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/m_lib/clock/mkclock.py b/m_lib/clock/mkclock.py
index b2dfaad..d9e3d03 100755
--- a/m_lib/clock/mkclock.py
+++ b/m_lib/clock/mkclock.py
@@ -10,7 +10,7 @@ sys.stdout.flush()
 time.sleep(3)
 print('\n' + " "*len("Testing...") + '\n', end=' ')
 
-need_clock = time.clock() != 3
+need_clock = time.clock() != 3 if hasattr(time, 'clock') else True
 
 outfile = open("clock.py", 'w')
 
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 5d2aba7..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
---install-option=-O2
diff --git a/setup.py b/setup.py
index 5b328b2..988e15b 100755
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,9 @@ from setuptools import setup
 
 setup(
     name = "m_lib",
-    version = "3.1.0.post1",
+    version = "3.1.0.post2",
     description = "Broytman Library for Python",
-    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",
@@ -34,6 +34,7 @@ setup(
         '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',
     ],
@@ -44,7 +45,7 @@ setup(
         "m_lib.pbar", "m_lib.rus",
     ],
     namespace_packages = ["m_lib"],
-    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     extras_require={
         'Metakit': ['Mk4py'],
         'ZODB': ['ZODB'],