Skip to content

Commit

Permalink
undo rename, name is taken on pypi
Browse files Browse the repository at this point in the history
  • Loading branch information
JarbasAl committed Jan 8, 2025
1 parent 9adc19d commit f4846df
Show file tree
Hide file tree
Showing 19 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# MANIFEST.in
include zbase/*
include z85base91/*
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions zbase/__init__.py → z85base91/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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!"):
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit f4846df

Please sign in to comment.