Update requirements. Change build scripts.

CHANGELOG.md

@@ -15,3 +15,9 @@ Installation see project description.
 ### Changed
 ### Fixed
 
+## [0.1.0.5] - 2024-05-15
+
+### Added
+### Changed
+* Update requirements
+### Fixed

build.env

@@ -0,0 +1 @@
+export PROJECT=drremote

clean.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "${SCRIPT_DIR}"/build.env
+
+cd ~/Projekte/${PROJECT} || exit 1
+if [ -d dist ]; then
+  rm -r dist
+fi
+if [ -d src/${PROJECT}.egg-info ]; then
+   rm -r src/${PROJECT}.egg-info
+fi
+

deploy-pypi.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "${SCRIPT_DIR}"/build.env
+
+cd ~/Projekte/${PROJECT} || exit 1
+
+./clean.sh
+./package.sh
+python3 -m pip install --upgrade twine
+# deploy
+# user:__token__
+python3 -m twine upload --repository pypi dist/*
+
+

deploy-testpypi.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "${SCRIPT_DIR}"/build.env
+
+cd ~/Projekte/${PROJECT} || exit 1
+
+./clean.sh
+./package.sh
+python3 -m pip install --upgrade twine
+# deploy
+# user:__token__
+python3 -m twine upload --repository testpypi dist/*
+
+
+

install.sh

@@ -1,42 +1,14 @@
 #!/usr/bin/env bash
-# as venv is activated we must reset PATH
-echo current python is: `which python`
-export PATH=`echo $PATH | tr ":" "\n" | grep -v "venv/bin" | tr "\n" ":"`
-echo switched to: `pyenv which python`
-export PROJECT=drremote
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "${SCRIPT_DIR}"/build.env
+
 cd ~/Projekte/${PROJECT} || exit 1
-if [ -d dist ]; then
-  rm -r dist
-fi
-if [ -d ${PROJECT}.egg-info ]; then
-   rm -r ${PROJECT}.egg-info
-fi
-if [ -d build ]; then
-  rm -r build
-fi
-#
-# install from local
-#python setup.py sdist
-#pip install dist/${PROJECT}*.gz --force-reinstall
-#
-# upload to pypi
-#
-# wheel must be installed before:pip install wheel
-python setup.py sdist bdist_wheel
-# twine must be installed before:pip install twine
-# user:__token__
-#python3 -m twine upload --repository testpypi dist/*
-python3 -m twine upload --repository pypi dist/*
+export PATH=`echo $PATH | tr ":" "\n" |  grep -v "venv" | tr "\n" ":"`
+./clean.sh
+./package.sh
+
+# Install global
+# pip3 install dist/${PROJECT}*.whl --force-reinstall
 
-# cleanup
-if [ -d dist ]; then
-  rm -r dist
-fi
-if [ -d ${PROJECT}.egg-info ]; then
-   rm -r ${PROJECT}.egg-info
-fi
-if [ -d build ]; then
-  rm -r build
-fi
 
 

package.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+clear
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source "${SCRIPT_DIR}"/build.env
+echo current python is: `which python3                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      `
+
+
+cd ~/Projekte/${PROJECT} || exit 1
+
+# install/update necessary packages
+python3 -m pip install --upgrade build
+python3 -m pip install --upgrade pip
+
+# Create build
+python3 -m build

requirements.txt

@@ -1 +1 @@
-setuptools~=57.0.0
+setuptools~=69.5.1

setup.py

@@ -8,11 +8,12 @@
 with open('README.md', encoding='utf-8') as f:
     long_description = f.read()
 
-__version__ = '0.1.0.4'
+__version__ = '0.1.0.5'
 setup(
     name='drremote',
     version=__version__,
-    packages=['drremote'],
+    packages=find_packages(where='src'),
+    package_dir={'': 'src'},
     url='',
     license='MIT',
     author='Dieter Stockhausen',

drremote/__init__.py → src/drremote/__init__.py

@@ -2,7 +2,7 @@
 
 
 def run_main():
-    from drremote.drremote import main
+    from .drremote import main
     main()
 
 

drremote/__main__.py → src/drremote/__main__.py

@@ -3,4 +3,4 @@
 from .__init__ import run_main
 
 if __name__ == '__main__':
-    run_main()
+    run_main()