Skip to content

Commit

Permalink
Merge pull request #1 from JordanWelsman/develop
Browse files Browse the repository at this point in the history
To-do list complete. Merging now.
  • Loading branch information
JordanWelsman authored Mar 2, 2023
2 parents 9379665 + eda3d5f commit d64df74
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 15 deletions.
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# MacOS
.DS_Store

# Python
.venv/

# Package
test.py

# Setuptools
build/
dist/
openjson.egg-info/
**/__pycache__/
8 changes: 0 additions & 8 deletions modular-json/__init__.py

This file was deleted.

9 changes: 9 additions & 0 deletions openjson/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Dunder attributes
__version__ = "v0.0.0" # update setup.py
__author__ = "Jordan Welsman"

from .encoding import *
from .loading import *
from .saving import *

__all__ = encoding.__all__, loading.__all__, saving.__all__
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions openjson/saving/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__all__ = []
16 changes: 9 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
long_description = fh.read()

# modular-json package data
py_modules = ["load", "save"]
py_modules = ["encoding", "loading", "saving"]

# Run setup function
setup(
name='modular-json',
name='openjson',
version=version,
description='A modular approach to parsing JSON.',
description='A modular approach to handling JSON.',
license='MIT',
long_description=long_description,
long_description_content_type='text/markdown',
author='Jordan Welsman',
author_email='[email protected]',
url='https://pypi.org/project/modular-json/',
download_url='https://github.com/JordanWelsman/modular-json/tags',
url='https://pypi.org/project/openjson/',
download_url='https://github.com/JordanWelsman/openjson/tags',
classifiers=[
'Development Status :: 1 - Planning',
'Intended Audience :: Developers',
Expand All @@ -44,9 +44,11 @@
"Programming Language :: Python :: 3.12"
],
package_data = {
'modular-json': py_modules
'openjson': py_modules
},
python_requires=python_version,

install_requires = [
"jutl"
],
keywords='python, json, modular, parsing, interpreting, exporting, importing'
)
23 changes: 23 additions & 0 deletions unbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/sh

# modular-json Unbuild Script
# To be used to delete the directories & files created by `python setup.py bdist_wheel`.

# Author : Jordan Welsman
# Copyright : Jordan Welsman

echo "You are about to delete files & folders from jutils."
echo "These files are crucial to the ability to install and import jutils."
read -p "Do you want to continue? [Y/n]: "

if [[ $REPLY =~ ^[Yy]$ ]]
then
rm -rf build # remove build directory if exists
rm -rf dist # remove distribution directory if exists
find . -name __pycache__ -type d -print0|xargs -0 rm -r -- # remove all pycache directories
find . -name .pytest_cache -type d -print0|xargs -0 rm -r -- # remove all pytest cache directories
find . -name openjson.egg-info -type d -print0|xargs -0 rm -r -- # remove all egg-info directories
echo "Project successfully unbuilt."
else
echo "Operation aborted."
fi

0 comments on commit d64df74

Please sign in to comment.