From 608f5f0f43498366cedc8ff18e571e7c65fd5a9b Mon Sep 17 00:00:00 2001 From: Rik Bouwmeester Date: Wed, 20 Nov 2024 11:18:14 +0100 Subject: [PATCH 1/4] Update dependencies, metadata --- pyproject.toml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c6c3c4d37..e0d5f8d00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,9 +15,16 @@ license = { text = "GPLv3" } keywords = ["driver", "crazyflie", "quadcopter"] classifiers = [ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Topic :: System :: Hardware :: Hardware Drivers", + "Topic :: Scientific/Engineering :: Robotics", + "Intended Audience :: Science/Research", + "Intended Audience :: Education", + "Intended Audience :: Developers", + "Operating System :: Linux", + "Operating System :: MacOS", + "Operating System :: Microsoft :: Windows", # Supported Python versions "Programming Language :: Python :: 3.10", @@ -28,14 +35,13 @@ classifiers = [ requires-python = ">= 3.10" dependencies = [ - "pyusb>=1.0.0b2", + "pyusb~=1.2", "libusb-package~=1.0", - "scipy~=1.7", - "numpy~=1.20", - "packaging~=24.0", + "scipy~=1.14", + "numpy~=1.26", + "packaging~=24.2", ] - [project.urls] Homepage = "https://www.bitcraze.io" Documentation = "https://www.bitcraze.io/documentation/repository/crazyflie-lib-python/master/" From 52bff9ddc07d1b04c757d302ce3821b87999a2bc Mon Sep 17 00:00:00 2001 From: Rik Bouwmeester Date: Wed, 20 Nov 2024 11:18:29 +0100 Subject: [PATCH 2/4] Include Python 3.13 installation instructions --- docs/installation/install.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/installation/install.md b/docs/installation/install.md index f8c696dda..a505d74e3 100644 --- a/docs/installation/install.md +++ b/docs/installation/install.md @@ -7,6 +7,7 @@ page_id: install This project requires Python 3.10+. +To install on Python 3.13, build tools and Python development headers are required. See below sections for more platform-specific requirements. ## Install from Source @@ -78,6 +79,8 @@ With linux, the crazyradio is easily recognized, but you have to setup UDEVpermi Look at the [Zadig crazyradio instructions](https://www.bitcraze.io/documentation/repository/crazyradio-firmware/master/building/usbwindows/) to install crazyradio on Windows +If you're using Python 3.13, you need to install [Visual Studio](https://visualstudio.microsoft.com/downloads/). During the installation process, you only need to select the Desktop Development with C++ workload in the Visual Studio Installer. + ### macOS If you are using python 3.12 on mac you need to install libusb using homebrew. ``` From 95ced817175552a9ad947eba35f4b615b1cadf4e Mon Sep 17 00:00:00 2001 From: Rik Bouwmeester Date: Wed, 20 Nov 2024 11:25:05 +0100 Subject: [PATCH 3/4] Automatic versioning Identical to cfclient --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e0d5f8d00..6677f6f41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [build-system] -requires = ["setuptools>=61.0", "wheel"] +requires = ["setuptools>=61.0", "wheel", "setuptools_scm"] build-backend = "setuptools.build_meta" [project] name = "cflib" -version = "0.1.27.1.dev0" +dynamic = ["version"] description = "Crazyflie Python driver" authors = [ { name = "Bitcraze and contributors", email = "contact@bitcraze.io" }, @@ -59,3 +59,6 @@ find = { exclude = ["examples", "test"] } [tool.setuptools.package-data] "cflib.resources.binaries" = ["cflib/resources/binaries/*.bin"] + +[tool.setuptools_scm] +version_scheme = "no-guess-dev" From 16528967435b08d46b2b4ba0ef0806af1331590b Mon Sep 17 00:00:00 2001 From: Rik Bouwmeester Date: Wed, 20 Nov 2024 12:01:43 +0100 Subject: [PATCH 4/4] Support auto versioning in GitHub publishing workflows --- .github/workflows/python-publish.yml | 2 ++ .github/workflows/test-python-publish.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index d5f2232b1..0e197504e 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -26,6 +26,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/test-python-publish.yml b/.github/workflows/test-python-publish.yml index 947a42101..2b4851bd3 100644 --- a/.github/workflows/test-python-publish.yml +++ b/.github/workflows/test-python-publish.yml @@ -26,6 +26,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v4 with: