diff --git a/LICENSE b/LICENSE index e4245241e9..f62a7f479b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2012-2022 Andrews Cordolino Sobral +Copyright (c) 2012-2024 Andrews Cordolino Sobral Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/MANIFEST.in b/MANIFEST.in index edea572f1c..6c3dc982ee 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,8 @@ include *.txt -prune src -recursive-include src/algorithms *.* -recursive-include src/tools *.* -recursive-include src/utils *.* +prune bgslibrary +recursive-include bgslibrary/algorithms *.* +recursive-include bgslibrary/tools *.* +recursive-include bgslibrary/utils *.* prune wrapper recursive-include wrapper/python *.* recursive-include modules *.* diff --git a/modules/pybind11 b/modules/pybind11 index 65bbd4e0b2..c9d32a81f4 160000 --- a/modules/pybind11 +++ b/modules/pybind11 @@ -1 +1 @@ -Subproject commit 65bbd4e0b210655a981be91ae2d3daca358f30f8 +Subproject commit c9d32a81f40ad540015814edf13b29980c63e39c diff --git a/setup.py b/setup.py index 8ddefdffe2..f396dffef5 100644 --- a/setup.py +++ b/setup.py @@ -79,8 +79,7 @@ def run(self): os.path.splitext(_lib)[1] in [".dll", ".so"] and not (_lib.startswith("python") or _lib.startswith(PACKAGE_NAME))] for lib in libs: - shutil.move(lib, os.path.join(self.build_dir, - os.path.basename(lib))) + shutil.move(lib, os.path.join(self.build_dir, os.path.basename(lib))) # Mark the libs for installation, adding them to # distribution.data_files seems to ensure that setuptools' record # writer appends them to installed-files.txt in the package's egg-info @@ -96,9 +95,7 @@ def run(self): # included in the package, but are resultant of the cmake build # step; depending on the files that are generated from your cmake # build chain, you may need to modify the below code - self.distribution.data_files = [os.path.join(self.install_dir, - os.path.basename(lib)) - for lib in libs] + self.distribution.data_files = [os.path.join(self.install_dir, os.path.basename(lib)) for lib in libs] # Must be forced to run after adding the libs to data_files self.distribution.run_command("install_data") super(InstallCMakeLibs, self).run() @@ -120,9 +117,7 @@ def run(self): os.listdir(bin_dir) if os.path.isdir(os.path.join(bin_dir, _dir))] for scripts_dir in scripts_dirs: - shutil.move(scripts_dir, - os.path.join(self.build_dir, - os.path.basename(scripts_dir))) + shutil.move(scripts_dir, os.path.join(self.build_dir, os.path.basename(scripts_dir))) # Mark the scripts for installation, adding them to # distribution.scripts seems to ensure that the setuptools' record # writer appends them to installed-files.txt in the package's egg-info diff --git a/virtualenv-build-test-publish.sh b/virtualenv-build-test-publish.sh index 6023e116cc..c1588ca664 100644 --- a/virtualenv-build-test-publish.sh +++ b/virtualenv-build-test-publish.sh @@ -9,7 +9,7 @@ source bgslibrary_env/bin/activate # Upgrade pip and install required packages numpy and OpenCV python -m pip install --upgrade pip -python -m pip install wheel +python -m pip install wheel setuptools python -m pip install numpy python -m pip install opencv-python @@ -22,7 +22,12 @@ python setup.py install # Set the PYTHONPATH environment variable to the build directory to access the installed library # The following line is for Linux +# ubuntu 20 export PYTHONPATH=$PYTHONPATH:$PWD/build/lib.linux-x86_64-cpython-38 +# ubuntu 22 +export PYTHONPATH=$PYTHONPATH:$PWD/build/lib.linux-x86_64-cpython-310 +# ubuntu 24 +export PYTHONPATH=$PYTHONPATH:$PWD/build/lib.linux-x86_64-cpython-312 # The following line is for Mac export PYTHONPATH=$PYTHONPATH:$PWD/build/lib.macosx-11-x86_64-cpython-39