From fcdb8a28b371155b7a999492142d4f885aaf90da Mon Sep 17 00:00:00 2001 From: Roberto Alsina Date: Mon, 3 Jun 2024 17:42:43 -0300 Subject: [PATCH] Reorg'd code, doesn't work --- .gitignore | 162 ++++++++++++++++++ README => README.md | 0 {samples => examples}/README | 0 {samples => examples}/demo1.py | 2 +- {samples => examples}/demo2.py | 0 {samples => examples}/demo3.py | 0 {samples => examples}/demo4.py | 0 {samples => examples}/demo5.py | 0 setup.py | 116 +++++-------- {Pyxform/Lib => src/pyxforms}/Pyxform.py | 0 {Pyxform => src/pyxforms}/__init__.py | 0 {Pyxform/Modules => src/pyxforms}/bitmaps.c | 0 {Pyxform/Modules => src/pyxforms}/box.c | 0 {Pyxform/Modules => src/pyxforms}/browser.c | 0 {Pyxform/Modules => src/pyxforms}/button.c | 0 {Pyxform/Modules => src/pyxforms}/choice.c | 0 {Pyxform/Modules => src/pyxforms}/clock.c | 0 {Pyxform/Modules => src/pyxforms}/counter.c | 0 {Pyxform/Modules => src/pyxforms}/dial.c | 0 {Pyxform/Modules => src/pyxforms}/forms.c | 0 {Pyxform/Modules => src/pyxforms}/frame.c | 0 {Pyxform/Modules => src/pyxforms}/goodies.c | 0 {Pyxform/Modules => src/pyxforms}/input.c | 0 {Pyxform/Modules => src/pyxforms}/menu.c | 0 {Pyxform/Modules => src/pyxforms}/objects.c | 0 {Pyxform/Modules => src/pyxforms}/pixmaps.c | 0 {Pyxform/Modules => src/pyxforms}/popups.c | 0 .../Modules => src/pyxforms}/positioner.c | 0 {Pyxform/Modules => src/pyxforms}/slider.c | 0 {Pyxform/Modules => src/pyxforms}/text.c | 0 {Pyxform/Modules => src/pyxforms}/timer.c | 0 {Pyxform/Modules => src/pyxforms}/xforms.c | 0 {Pyxform/Modules => src/pyxforms}/xyplot.c | 0 33 files changed, 207 insertions(+), 73 deletions(-) create mode 100644 .gitignore rename README => README.md (100%) rename {samples => examples}/README (100%) rename {samples => examples}/demo1.py (94%) rename {samples => examples}/demo2.py (100%) rename {samples => examples}/demo3.py (100%) rename {samples => examples}/demo4.py (100%) rename {samples => examples}/demo5.py (100%) rename {Pyxform/Lib => src/pyxforms}/Pyxform.py (100%) rename {Pyxform => src/pyxforms}/__init__.py (100%) rename {Pyxform/Modules => src/pyxforms}/bitmaps.c (100%) rename {Pyxform/Modules => src/pyxforms}/box.c (100%) rename {Pyxform/Modules => src/pyxforms}/browser.c (100%) rename {Pyxform/Modules => src/pyxforms}/button.c (100%) rename {Pyxform/Modules => src/pyxforms}/choice.c (100%) rename {Pyxform/Modules => src/pyxforms}/clock.c (100%) rename {Pyxform/Modules => src/pyxforms}/counter.c (100%) rename {Pyxform/Modules => src/pyxforms}/dial.c (100%) rename {Pyxform/Modules => src/pyxforms}/forms.c (100%) rename {Pyxform/Modules => src/pyxforms}/frame.c (100%) rename {Pyxform/Modules => src/pyxforms}/goodies.c (100%) rename {Pyxform/Modules => src/pyxforms}/input.c (100%) rename {Pyxform/Modules => src/pyxforms}/menu.c (100%) rename {Pyxform/Modules => src/pyxforms}/objects.c (100%) rename {Pyxform/Modules => src/pyxforms}/pixmaps.c (100%) rename {Pyxform/Modules => src/pyxforms}/popups.c (100%) rename {Pyxform/Modules => src/pyxforms}/positioner.c (100%) rename {Pyxform/Modules => src/pyxforms}/slider.c (100%) rename {Pyxform/Modules => src/pyxforms}/text.c (100%) rename {Pyxform/Modules => src/pyxforms}/timer.c (100%) rename {Pyxform/Modules => src/pyxforms}/xforms.c (100%) rename {Pyxform/Modules => src/pyxforms}/xyplot.c (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..82f9275 --- /dev/null +++ b/.gitignore @@ -0,0 +1,162 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ diff --git a/README b/README.md similarity index 100% rename from README rename to README.md diff --git a/samples/README b/examples/README similarity index 100% rename from samples/README rename to examples/README diff --git a/samples/demo1.py b/examples/demo1.py similarity index 94% rename from samples/demo1.py rename to examples/demo1.py index 427da74..0adcf3b 100755 --- a/samples/demo1.py +++ b/examples/demo1.py @@ -1,5 +1,5 @@ #!/usr/local/bin/python -from Pyxform import * +from pyxforms import * # # Init the library (sucks but works) diff --git a/samples/demo2.py b/examples/demo2.py similarity index 100% rename from samples/demo2.py rename to examples/demo2.py diff --git a/samples/demo3.py b/examples/demo3.py similarity index 100% rename from samples/demo3.py rename to examples/demo3.py diff --git a/samples/demo4.py b/examples/demo4.py similarity index 100% rename from samples/demo4.py rename to examples/demo4.py diff --git a/samples/demo5.py b/examples/demo5.py similarity index 100% rename from samples/demo5.py rename to examples/demo5.py diff --git a/setup.py b/setup.py index f45a9ad..5bd4804 100644 --- a/setup.py +++ b/setup.py @@ -2,143 +2,116 @@ from setuptools import setup, Extension bitmaps = Extension( - "Pyxform.bitmaps", - sources=["Pyxform/Modules/bitmaps.c"], + name="pyxforms.bitmaps", + sources=["src/pyxforms/bitmaps.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) box = Extension( - "Pyxform.box", - sources=["Pyxform/Modules/box.c"], + name="pyxforms.box", + sources=["src/pyxforms/box.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) browser = Extension( - "Pyxform.browser", - sources=["Pyxform/Modules/browser.c"], + name="pyxforms.browser", + sources=["src/pyxforms/browser.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) button = Extension( - "Pyxform.button", - sources=["Pyxform/Modules/button.c"], + name="pyxforms.button", + sources=["src/pyxforms/button.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) choice = Extension( - "Pyxform.choice", - sources=["Pyxform/Modules/choice.c"], + name="pyxforms.choice", + sources=["src/pyxforms/choice.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) clock = Extension( - "Pyxform.clock", - sources=["Pyxform/Modules/clock.c"], + name="pyxforms.clock", + sources=["src/pyxforms/clock.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) counter = Extension( - "Pyxform.counter", - sources=["Pyxform/Modules/counter.c"], + name="pyxforms.counter", + sources=["src/pyxforms/counter.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) dial = Extension( - "Pyxform.dial", - sources=["Pyxform/Modules/dial.c"], + name="pyxforms.dial", + sources=["src/pyxforms/dial.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) forms = Extension( - "Pyxform.forms", - sources=["Pyxform/Modules/forms.c"], + name="pyxforms.forms", + sources=["src/pyxforms/forms.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) frame = Extension( - "Pyxform.frame", - sources=["Pyxform/Modules/frame.c"], + name="pyxforms.frame", + sources=["src/pyxforms/frame.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) goodies = Extension( - "Pyxform.goodies", - sources=["Pyxform/Modules/goodies.c"], + name="pyxforms.goodies", + sources=["src/pyxforms/goodies.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) input = Extension( - "Pyxform.input", - sources=["Pyxform/Modules/input.c"], + name="pyxforms.input", + sources=["src/pyxforms/input.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) menu = Extension( - "Pyxform.menu", - sources=["Pyxform/Modules/menu.c"], + name="pyxforms.menu", + sources=["src/pyxforms/menu.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) objects = Extension( - "Pyxform.objects", - sources=["Pyxform/Modules/objects.c"], + name="pyxforms.objects", + sources=["src/pyxforms/objects.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) pixmaps = Extension( - "Pyxform.pixmaps", - sources=["Pyxform/Modules/pixmaps.c"], + name="pyxforms.pixmaps", + sources=["src/pyxforms/pixmaps.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) popups = Extension( - "Pyxform.popups", - sources=["Pyxform/Modules/popups.c"], + name="pyxforms.popups", + sources=["src/pyxforms/popups.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) positioner = Extension( - "Pyxform.positioner", - sources=["Pyxform/Modules/positioner.c"], + name="pyxforms.positioner", + sources=["src/pyxforms/positioner.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) slider = Extension( - "Pyxform.slider", - sources=["Pyxform/Modules/slider.c"], + name="pyxforms.slider", + sources=["src/pyxforms/slider.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) text = Extension( - "Pyxform.text", - sources=["Pyxform/Modules/text.c"], + name="pyxforms.text", + sources=["src/pyxforms/text.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) timer = Extension( - "Pyxform.timer", - sources=["Pyxform/Modules/timer.c"], + name="pyxforms.timer", + sources=["src/pyxforms/timer.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) xforms = Extension( - "Pyxform.xforms", - sources=["Pyxform/Modules/xforms.c"], + name="pyxforms.xforms", + sources=["src/pyxforms/xforms.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) xyplot = Extension( - "Pyxform.xyplot", - sources=["Pyxform/Modules/xyplot.c"], + name="pyxforms.xyplot", + sources=["src/pyxforms/xyplot.c"], libraries=["forms"], - library_dirs=["/usr/local/lib"], ) setup( - name="PyXForms", - version="0.2", - description="This is OLD code", - author="Roberto Alsina", - author_email="ralsina@netmanagers.com.ar", ext_modules=[ bitmaps, box, @@ -163,5 +136,4 @@ setup( xforms, xyplot, ], - packages=["Pyxform"], ) diff --git a/Pyxform/Lib/Pyxform.py b/src/pyxforms/Pyxform.py similarity index 100% rename from Pyxform/Lib/Pyxform.py rename to src/pyxforms/Pyxform.py diff --git a/Pyxform/__init__.py b/src/pyxforms/__init__.py similarity index 100% rename from Pyxform/__init__.py rename to src/pyxforms/__init__.py diff --git a/Pyxform/Modules/bitmaps.c b/src/pyxforms/bitmaps.c similarity index 100% rename from Pyxform/Modules/bitmaps.c rename to src/pyxforms/bitmaps.c diff --git a/Pyxform/Modules/box.c b/src/pyxforms/box.c similarity index 100% rename from Pyxform/Modules/box.c rename to src/pyxforms/box.c diff --git a/Pyxform/Modules/browser.c b/src/pyxforms/browser.c similarity index 100% rename from Pyxform/Modules/browser.c rename to src/pyxforms/browser.c diff --git a/Pyxform/Modules/button.c b/src/pyxforms/button.c similarity index 100% rename from Pyxform/Modules/button.c rename to src/pyxforms/button.c diff --git a/Pyxform/Modules/choice.c b/src/pyxforms/choice.c similarity index 100% rename from Pyxform/Modules/choice.c rename to src/pyxforms/choice.c diff --git a/Pyxform/Modules/clock.c b/src/pyxforms/clock.c similarity index 100% rename from Pyxform/Modules/clock.c rename to src/pyxforms/clock.c diff --git a/Pyxform/Modules/counter.c b/src/pyxforms/counter.c similarity index 100% rename from Pyxform/Modules/counter.c rename to src/pyxforms/counter.c diff --git a/Pyxform/Modules/dial.c b/src/pyxforms/dial.c similarity index 100% rename from Pyxform/Modules/dial.c rename to src/pyxforms/dial.c diff --git a/Pyxform/Modules/forms.c b/src/pyxforms/forms.c similarity index 100% rename from Pyxform/Modules/forms.c rename to src/pyxforms/forms.c diff --git a/Pyxform/Modules/frame.c b/src/pyxforms/frame.c similarity index 100% rename from Pyxform/Modules/frame.c rename to src/pyxforms/frame.c diff --git a/Pyxform/Modules/goodies.c b/src/pyxforms/goodies.c similarity index 100% rename from Pyxform/Modules/goodies.c rename to src/pyxforms/goodies.c diff --git a/Pyxform/Modules/input.c b/src/pyxforms/input.c similarity index 100% rename from Pyxform/Modules/input.c rename to src/pyxforms/input.c diff --git a/Pyxform/Modules/menu.c b/src/pyxforms/menu.c similarity index 100% rename from Pyxform/Modules/menu.c rename to src/pyxforms/menu.c diff --git a/Pyxform/Modules/objects.c b/src/pyxforms/objects.c similarity index 100% rename from Pyxform/Modules/objects.c rename to src/pyxforms/objects.c diff --git a/Pyxform/Modules/pixmaps.c b/src/pyxforms/pixmaps.c similarity index 100% rename from Pyxform/Modules/pixmaps.c rename to src/pyxforms/pixmaps.c diff --git a/Pyxform/Modules/popups.c b/src/pyxforms/popups.c similarity index 100% rename from Pyxform/Modules/popups.c rename to src/pyxforms/popups.c diff --git a/Pyxform/Modules/positioner.c b/src/pyxforms/positioner.c similarity index 100% rename from Pyxform/Modules/positioner.c rename to src/pyxforms/positioner.c diff --git a/Pyxform/Modules/slider.c b/src/pyxforms/slider.c similarity index 100% rename from Pyxform/Modules/slider.c rename to src/pyxforms/slider.c diff --git a/Pyxform/Modules/text.c b/src/pyxforms/text.c similarity index 100% rename from Pyxform/Modules/text.c rename to src/pyxforms/text.c diff --git a/Pyxform/Modules/timer.c b/src/pyxforms/timer.c similarity index 100% rename from Pyxform/Modules/timer.c rename to src/pyxforms/timer.c diff --git a/Pyxform/Modules/xforms.c b/src/pyxforms/xforms.c similarity index 100% rename from Pyxform/Modules/xforms.c rename to src/pyxforms/xforms.c diff --git a/Pyxform/Modules/xyplot.c b/src/pyxforms/xyplot.c similarity index 100% rename from Pyxform/Modules/xyplot.c rename to src/pyxforms/xyplot.c