Merge pull request #20 from kcelebi/dev

Modifying Package Structure, adding GitHub Actions

Author: kcelebi

.github/workflows/publish.yml

@@ -0,0 +1,18 @@
+name: Publish to PyPI.org
+#on: workflow_dispatch
+on:
+  release:
+    types: [published]
+jobs:
+  pypi:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - run: python3 -m pip install --upgrade build && python3 -m build
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,12 @@
+name: Create a new patch release
+on: workflow_dispatch
+jobs:
+  github:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Create new patch release
+        run: .github/workflows/scripts/release.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

.github/workflows/scripts/release.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+import json
+import subprocess
+
+
+def get_last_version() -> str:
+    """Return the version number of the last release."""
+    json_string = (
+        subprocess.run(
+            ["gh", "release", "view", "--json", "tagName"],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        .stdout.decode("utf8")
+        .strip()
+    )
+
+    return json.loads(json_string)["tagName"]
+
+
+def bump_patch_number(version_number: str) -> str:
+    """Return a copy of `version_number` with the patch number incremented."""
+    major, minor, patch = version_number.split(".")
+    return f"{major}.{minor}.{int(patch) + 1}"
+
+
+def create_new_patch_release():
+    """Create a new patch release on GitHub."""
+    try:
+        last_version_number = get_last_version()
+    except subprocess.CalledProcessError as err:
+        '''if err.stderr.decode("utf8").startswith("HTTP 404:"):
+                                    # The project doesn't have any releases yet.
+                                    new_version_number = "0.0.1"
+                                else:
+                                    raise'''
+        new_version_number = "0.0.1"
+    else:
+        new_version_number = bump_patch_number(last_version_number)
+
+    subprocess.run(
+        ["gh", "release", "create", "--generate-notes", new_version_number],
+        check=True,
+    )
+
+
+if __name__ == "__main__":
+    create_new_patch_release()

.gitignore

@@ -3,3 +3,5 @@ riscv_assembler/prjtest.pybuild
 dist
 riscv_assembler.egg-info
 build
+.pytest_cache/
+__pycache__/

setup.py renamed to deprc_setup.py

@@ -0,0 +1,33 @@
+[metadata]
+name = riscv-assembler
+author = Kaya Celebi
+author_email = kayacelebi17@gmail.com
+description = RISC-V Assembly code assembler package for Python.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/kcelebi/riscv-assembler
+project_urls =
+    Bug Tracker = https://github.com/kcelebi/riscv-assembler/issues
+    Changelog = https://github.com/kcelebi/riscv-assembler/releases
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Intended Audience :: Developers
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.6
+install_requires = 
+    bitstring
+
+[options.packages.find]
+where = src
+
+[options.package_data]
+* = data/*.dat
+
+[options.entry_points]
+console_scripts =
+    riscv_assembler = riscv_assembler.app:entry_point

riscv_assembler/__init__.py

@@ -12,8 +12,8 @@
 		- Update tests
 '''
 
-from riscv_assembler.instr_arr import *
-from riscv_assembler.parse import *
+from src.riscv_assembler.instr_arr import *
+from src.riscv_assembler.parse import *
 
 __all__ = ['AssemblyConverter']
 
@@ -45,6 +45,9 @@ def clone(self):
 			hex_mode = self.__hex_mode
 		)
 
+	def __call__(self, *args):
+		return self.convert(*args)
+
 	def __check_output_mode(self, x) -> str:
 		mod = ''.join(sorted(x.split()))
 		assert mod in ['a', 'f', 'p', None], "Output Mode needs to be one of a(rray), f(ile), p(rint), or None."
@@ -110,15 +113,16 @@ def convert(self, input : str, file : str = None):
 			return output
 		elif self.__output_mode == 'f':
 			assert file != None, "For output mode to file, need to provided file name."
-			self.write_to_file(output, file)
+			AssemblyConverter.write_to_file(output, file)
 			return
 		elif self.__output_mode == 'p':
 			print(output)
 			return
 
 		raise NotImplementedError()
 
-	def write_to_file(self, output : list, file : str) -> None:
+	@staticmethod
+	def write_to_file(output : list, file : str) -> None:
 		extension = file[-4:]
 
 		if extension == '.bin':
@@ -159,4 +163,3 @@ def apply_nibble(output : list) -> list:
 	def apply_hex(output : list) -> list:
 		raise NotImplementedError()
 		return ...
-

riscv_assembler/__pycache__/__init__.cpython-36.pyc

@@ -170,8 +170,8 @@ def compute_instr(self, instr, imm, rd):
 
 	@staticmethod
 	def immediate(imm):
-		mod_imm = format(((1 << 20) - 1) & int(imm), '013b')
-		return mod_imm[20-20] + mod_imm[20-10:20-1] + mod_imm[20-11] + mod_imm[20-19:20-12]
+		mod_imm = format(((1 << 21) - 1) & int(imm), '021b')
+		return mod_imm[20-20] + mod_imm[20-10:20-0] + mod_imm[20-11] + mod_imm[20-19:20-11]
 
 class InstructionParser:
 	def organize(self, *args):