Browse Source

Improved the build procedure to work entirely in the tmp folder

pull/47/head
Eugenio Parodi 4 years ago
parent
commit
9d75824afb
  1. 15
      Makefile
  2. 2
      TermTk/TTkTheme/theme.py
  3. 8
      setup.py
  4. 2
      tools/prepareBuild.sh

15
Makefile

@ -36,13 +36,16 @@ runDemo: .venv
build: .venv
. .venv/bin/activate ; \
rm -rf dist ; \
tools/prepareBuild.sh release ; \
python3 -m build
cd tmp ; \
python3 -m build \
deploy: .venv
. .venv/bin/activate ; \
python3 -m twine upload tmp/dist/*
buildTest: .venv
. .venv/bin/activate ; \
rm -rf dist ; \
tools/prepareBuild.sh test ; \
python3 -m build ; \
@ -57,11 +60,7 @@ deployDoc:
deployTest: .venv
. .venv/bin/activate ; \
python3 -m twine upload --repository testpypi dist/* --verbose
deploy: .venv
. .venv/bin/activate ; \
python3 -m twine upload dist/*
python3 -m twine upload --repository testpypi tmp/dist/* --verbose
test: .venv
. .venv/bin/activate ; \

2
TermTk/TTkTheme/theme.py

@ -24,7 +24,7 @@
from TermTk.TTkCore.color import TTkColor
from TermTk.TTkCore.helper import TTkHelper
from TermTk.TTkCore.string import TTkString
# from TermTk.TTkCore.string import TTkString
import TermTk.TTkTheme.fileicon_nerd as fi_nerd
import TermTk.TTkTheme.fileicon_utf8 as fi_utf8
import TermTk.TTkTheme.fileicon_ascii as fi_ascii

8
setup.py

@ -1,5 +1,5 @@
import setuptools, os
from tmp.TermTk.TTkCore.cfg import TTkCfg
from TermTk.TTkCore.cfg import TTkCfg
with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()
@ -31,7 +31,7 @@ setuptools.setup(
"Topic :: Terminals",
"Topic :: Software Development :: User Interfaces"],
# packages=setuptools.find_packages(),
packages = setuptools.find_packages(where="tmp"),
package_dir = {"":"tmp"},
packages = setuptools.find_packages(where="."),
package_dir = {"":"."},
python_requires=">=3.8",
)
)

2
tools/prepareBuild.sh

@ -70,6 +70,8 @@ echo Name: ${_NAME}
mkdir -p ${_TMP_PATH}
rm -rf ${_TMP_PATH}/*
cp setup.py README.md LICENSE ${_TMP_PATH}
cp -a ${_BASE_PATH}/TermTk ${_TMP_PATH}
sed "s,__VERSION__,${_VERSION}," -i ${_TMP_PATH}/TermTk/TTkCore/cfg.py
sed "s,__NAME__,${_NAME}," -i ${_TMP_PATH}/TermTk/TTkCore/cfg.py

Loading…
Cancel
Save