From f4846df365962540e6f50c2e7db8b738b355d71f Mon Sep 17 00:00:00 2001 From: miro Date: Wed, 8 Jan 2025 16:31:03 +0000 Subject: [PATCH] undo rename, name is taken on pypi --- .github/workflows/publish_stable.yml | 2 +- .github/workflows/release_workflow.yml | 2 +- MANIFEST.in | 2 +- setup.py | 8 ++++---- {zbase => z85base91}/__init__.py | 12 ++++++------ {zbase => z85base91}/b91.py | 0 {zbase => z85base91}/bench.py | 0 {zbase => z85base91}/libbase91-aarch64.so | Bin {zbase => z85base91}/libbase91-i386.so | Bin {zbase => z85base91}/libbase91-x86_64.so | Bin {zbase => z85base91}/libz85b-aarch64.so | Bin {zbase => z85base91}/libz85b-i386.so | Bin {zbase => z85base91}/libz85b-x86_64.so | Bin {zbase => z85base91}/libz85p-aarch64.so | Bin {zbase => z85base91}/libz85p-i386.so | Bin {zbase => z85base91}/libz85p-x86_64.so | Bin {zbase => z85base91}/version.py | 0 {zbase => z85base91}/z85b.py | 0 {zbase => z85base91}/z85p.py | 0 19 files changed, 13 insertions(+), 13 deletions(-) rename {zbase => z85base91}/__init__.py (97%) rename {zbase => z85base91}/b91.py (100%) rename {zbase => z85base91}/bench.py (100%) rename {zbase => z85base91}/libbase91-aarch64.so (100%) rename {zbase => z85base91}/libbase91-i386.so (100%) rename {zbase => z85base91}/libbase91-x86_64.so (100%) rename {zbase => z85base91}/libz85b-aarch64.so (100%) rename {zbase => z85base91}/libz85b-i386.so (100%) rename {zbase => z85base91}/libz85b-x86_64.so (100%) rename {zbase => z85base91}/libz85p-aarch64.so (100%) rename {zbase => z85base91}/libz85p-i386.so (100%) rename {zbase => z85base91}/libz85p-x86_64.so (100%) rename {zbase => z85base91}/version.py (100%) rename {zbase => z85base91}/z85b.py (100%) rename {zbase => z85base91}/z85p.py (100%) diff --git a/.github/workflows/publish_stable.yml b/.github/workflows/publish_stable.yml index 0e5d94e..6eb1e27 100644 --- a/.github/workflows/publish_stable.yml +++ b/.github/workflows/publish_stable.yml @@ -10,7 +10,7 @@ jobs: secrets: inherit with: branch: 'master' - version_file: 'zbase/version.py' + version_file: 'z85base91/version.py' setup_py: 'setup.py' publish_release: true diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml index af152a0..047a030 100644 --- a/.github/workflows/release_workflow.yml +++ b/.github/workflows/release_workflow.yml @@ -12,7 +12,7 @@ jobs: secrets: inherit with: branch: 'dev' - version_file: 'zbase/version.py' + version_file: 'z85base91/version.py' setup_py: 'setup.py' update_changelog: true publish_prerelease: true diff --git a/MANIFEST.in b/MANIFEST.in index 252f2e8..cc64457 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ # MANIFEST.in -include zbase/* +include z85base91/* \ No newline at end of file diff --git a/setup.py b/setup.py index 42c9011..96ff75b 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ def get_version(): """ Find the version of the package""" - version_file = os.path.join(BASEDIR, 'zbase', 'version.py') + version_file = os.path.join(BASEDIR, 'z85base91', 'version.py') major, minor, build, alpha = (None, None, None, None) with open(version_file) as f: for line in f: @@ -38,10 +38,10 @@ def required(requirements_file): setup( - name='zbase', + name='z85base91', version=get_version(), - packages=['zbase'], - url='https://github.com/JarbasHiveMind/zbase', + packages=['z85base91'], + url='https://github.com/JarbasHiveMind/z85base91', license='Apache-2.0', author='jarbasAi', include_package_data=True, diff --git a/zbase/__init__.py b/z85base91/__init__.py similarity index 97% rename from zbase/__init__.py rename to z85base91/__init__.py index f0a022e..ba83a6f 100644 --- a/zbase/__init__.py +++ b/z85base91/__init__.py @@ -97,7 +97,7 @@ def decode(cls, data: bytes) -> bytes: return bytes(ctypes.string_at(decoded_data, out_len.value)) except Exception as e: logging.warning(f"Z85P C library not available: {e}. Falling back to pure Python implementation.") - from .z85p import Z85P + from z85base91.z85p import Z85P try: class B91: @@ -172,7 +172,7 @@ def encode(cls, data: Union[str, bytes]) -> bytes: return ctypes.string_at(encoded_data, output_len.value) except Exception as e: logging.warning(f"Base91 C library not available: {e}. Falling back to pure Python implementation.") - from .b91 import B91 + from z85base91.b91 import B91 try: class Z85B: @@ -242,13 +242,13 @@ def decode(cls, encoded_data: bytes) -> bytes: cls.lib.free(decoded_data) except Exception as e: logging.warning(f"Z85B C library not available: {e}. Falling back to pure Python implementation.") - from .z85b import Z85B + from z85base91.z85b import Z85B if __name__ == "__main__": - from zbase.b91 import B91 as B91py - from zbase.z85b import Z85B as Z85Bpy - from zbase.z85p import Z85P as Z85Ppy + from z85base91.b91 import B91 as B91py + from z85base91.z85b import Z85B as Z85Bpy + from z85base91.z85p import Z85P as Z85Ppy def test_b91(s=b"Hello, Base91!"): diff --git a/zbase/b91.py b/z85base91/b91.py similarity index 100% rename from zbase/b91.py rename to z85base91/b91.py diff --git a/zbase/bench.py b/z85base91/bench.py similarity index 100% rename from zbase/bench.py rename to z85base91/bench.py diff --git a/zbase/libbase91-aarch64.so b/z85base91/libbase91-aarch64.so similarity index 100% rename from zbase/libbase91-aarch64.so rename to z85base91/libbase91-aarch64.so diff --git a/zbase/libbase91-i386.so b/z85base91/libbase91-i386.so similarity index 100% rename from zbase/libbase91-i386.so rename to z85base91/libbase91-i386.so diff --git a/zbase/libbase91-x86_64.so b/z85base91/libbase91-x86_64.so similarity index 100% rename from zbase/libbase91-x86_64.so rename to z85base91/libbase91-x86_64.so diff --git a/zbase/libz85b-aarch64.so b/z85base91/libz85b-aarch64.so similarity index 100% rename from zbase/libz85b-aarch64.so rename to z85base91/libz85b-aarch64.so diff --git a/zbase/libz85b-i386.so b/z85base91/libz85b-i386.so similarity index 100% rename from zbase/libz85b-i386.so rename to z85base91/libz85b-i386.so diff --git a/zbase/libz85b-x86_64.so b/z85base91/libz85b-x86_64.so similarity index 100% rename from zbase/libz85b-x86_64.so rename to z85base91/libz85b-x86_64.so diff --git a/zbase/libz85p-aarch64.so b/z85base91/libz85p-aarch64.so similarity index 100% rename from zbase/libz85p-aarch64.so rename to z85base91/libz85p-aarch64.so diff --git a/zbase/libz85p-i386.so b/z85base91/libz85p-i386.so similarity index 100% rename from zbase/libz85p-i386.so rename to z85base91/libz85p-i386.so diff --git a/zbase/libz85p-x86_64.so b/z85base91/libz85p-x86_64.so similarity index 100% rename from zbase/libz85p-x86_64.so rename to z85base91/libz85p-x86_64.so diff --git a/zbase/version.py b/z85base91/version.py similarity index 100% rename from zbase/version.py rename to z85base91/version.py diff --git a/zbase/z85b.py b/z85base91/z85b.py similarity index 100% rename from zbase/z85b.py rename to z85base91/z85b.py diff --git a/zbase/z85p.py b/z85base91/z85p.py similarity index 100% rename from zbase/z85p.py rename to z85base91/z85p.py