From 06b0b4484483a1d390c641939e2f4d0a3b4b196f Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 23 Feb 2024 13:47:37 -0500 Subject: [PATCH 1/7] Add setuptools_scm build arguments to pyproject.toml --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3a61336..0a23811 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,4 +2,6 @@ requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"] build-backend = "setuptools.build_meta" -[tool.setuptools_scm] \ No newline at end of file +[tool.setuptools_scm] +version_scheme = "release-branch-semver" +local_scheme = "no-local-version" \ No newline at end of file From dfb3b0018fa404a8efa78c26dcd8616c1ca36a99 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 23 Feb 2024 15:16:30 -0500 Subject: [PATCH 2/7] Remove `SCM_LOCAL_SCHEME` environment variable in release workflow as it is no longer used. --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ec2c4d..bb433f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,6 @@ on: env: PACKAGE_NAME: labscript - SCM_LOCAL_SCHEME: no-local-version ANACONDA_USER: labscript-suite # Configuration for a package with compiled extensions: From 003ce6c04042f7b49af09a148c7e3f53eb24e019 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 29 Feb 2024 16:19:14 -0500 Subject: [PATCH 3/7] Remove environment checks on `__version__.py` setuptools_scm --- labscript/__version__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/labscript/__version__.py b/labscript/__version__.py index fa43cee..76c02ca 100644 --- a/labscript/__version__.py +++ b/labscript/__version__.py @@ -1,4 +1,3 @@ -import os from pathlib import Path try: import importlib.metadata as importlib_metadata @@ -6,12 +5,13 @@ import importlib_metadata VERSION_SCHEME = { - "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"), - "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"), + "version_scheme": "release-branch-semver", + "local_scheme": "node-and-date", } root = Path(__file__).parent.parent if (root / '.git').is_dir(): + from setuptools_scm import get_version __version__ = get_version(root, **VERSION_SCHEME) else: From 67a5a89dae340fce91accc378eb4da0a054cce7f Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 29 Feb 2024 16:19:46 -0500 Subject: [PATCH 4/7] Remove environment checks in `setup.py` for setuptools_scm --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 1ff17d3..d76a4f1 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,8 @@ -import os from setuptools import setup VERSION_SCHEME = { - "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"), - "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"), + "version_scheme": "release-branch-semver", + "local_scheme": "node-and-date", } setup(use_scm_version=VERSION_SCHEME) From f41d9567ed6eace6b8d29286a4ae01554c34bf44 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 29 Feb 2024 20:30:15 -0500 Subject: [PATCH 5/7] Make `setuptools_scm` optional, even if installed in editable mode. --- labscript/__version__.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/labscript/__version__.py b/labscript/__version__.py index 76c02ca..c21f494 100644 --- a/labscript/__version__.py +++ b/labscript/__version__.py @@ -4,16 +4,22 @@ except ImportError: import importlib_metadata -VERSION_SCHEME = { - "version_scheme": "release-branch-semver", - "local_scheme": "node-and-date", -} - root = Path(__file__).parent.parent if (root / '.git').is_dir(): - - from setuptools_scm import get_version - __version__ = get_version(root, **VERSION_SCHEME) + try: + from setuptools_scm import get_version + VERSION_SCHEME = { + "version_scheme": "release-branch-semver", + "local_scheme": "node-and-date", + } + scm_version = get_version(root, **VERSION_SCHEME) + except ImportError: + scm_version = None +else: + scm_version = None + +if scm_version is not None: + __version__ = scm_version else: try: __version__ = importlib_metadata.version(__package__) From 225bbee6699e17af724fbab943a1a5cb8f520146 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 4 Apr 2024 13:57:59 -0400 Subject: [PATCH 6/7] Move all project metadata to `pyproject.toml` --- pyproject.toml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- setup.cfg | 42 ------------------------------------- 2 files changed, 56 insertions(+), 43 deletions(-) delete mode 100644 setup.cfg diff --git a/pyproject.toml b/pyproject.toml index 0a23811..c2b858d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,4 +4,59 @@ build-backend = "setuptools.build_meta" [tool.setuptools_scm] version_scheme = "release-branch-semver" -local_scheme = "no-local-version" \ No newline at end of file +local_scheme = "no-local-version" + +[tool.setuptools] +zip-safe = false +include-package-data = true + +[tool.setuptools.packages] +find = {namespaces = false} + + +[project] +name = "labscript" +description = "The labscript compiler — expressive control of harware-timed experiments" +authors = [ + {name = "The labscript suite community", email = "labscriptsuite@googlegroups.com"}, +] +keywords = ["experiment control", "automation"] +license = {file = 'LICENSE.txt'} +classifiers = [ + "License :: OSI Approved :: BSD LIcense", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", +] +requires-python = ">=3.6" +dependencies = [ + "importlib_metadata", + "labscript_utils>=3.0.0", + "numpy>=1.15", + "scipy", + "matplotlib", +] +dynamic = ["version"] + +[project.readme] +file = "README.md" +content-type = "text/markdown" + +[project.urls] +Homepage = "http://labscriptsuite.org/" +Documentation = "https://docs.labscriptsuite.org/" +Repository = "https://github.com/labscript-suite/labscript/" +Downloads = "https://github.com/labscript-suite/labscript/releases/" +Tracker = "https://github.com/labscript-suite/labscript/issues/" + +[project.optional-dependencies] +docs = [ + "PyQt5", + "Sphinx==7.2.6", + "sphinx-rtd-theme==2.0.0", + "myst_parser==2.0.0", +] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 0019991..0000000 --- a/setup.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[metadata] -name = labscript -description = The labscript compiler — expressive control of harware-timed experiments -long_description = file: README.md -long_description_content_type = text/markdown -author = The labscript suite community -author_email = labscriptsuite@googlegroups.com -url = http://labscriptsuite.org -project_urls = - Source Code=https://github.com/labscript-suite/labscript - Download=https://github.com/labscript-suite/labscript/releases - Tracker=https://github.com/labscript-suite/labscript/issues -keywords = experiment control automation -license = BSD -classifiers = - License :: OSI Approved :: BSD License - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - -[options] -zip_safe = False -include_package_data = True -packages = find: -python_requires = >=3.6 -install_requires = - importlib_metadata - labscript_utils>=3.3.0 - numpy>=1.15 - scipy - matplotlib - -[options.extras_require] -docs = - PyQt5 - Sphinx==7.2.6 - sphinx-rtd-theme==2.0.0 - myst_parser==2.0.0 From b3358c9f0806fc6cf0702f215ca40bc46105c5ad Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 29 Feb 2024 16:24:39 -0500 Subject: [PATCH 7/7] Make editable installs use `pyproject.toml` setuptools_scm config. Removes no longer necessary `setup.py`. --- setup.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index d76a4f1..0000000 --- a/setup.py +++ /dev/null @@ -1,8 +0,0 @@ -from setuptools import setup - -VERSION_SCHEME = { - "version_scheme": "release-branch-semver", - "local_scheme": "node-and-date", -} - -setup(use_scm_version=VERSION_SCHEME) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy