Skip to content

Commit

Permalink
Merge pull request #104 from dihm/metadata_overhaul
Browse files Browse the repository at this point in the history
Metadata overhaul
  • Loading branch information
dihm authored Jul 13, 2024
2 parents fdc4034 + a59a0d0 commit 7a84e38
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 68 deletions.
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:

env:
PACKAGE_NAME: blacs
SCM_LOCAL_SCHEME: no-local-version
ANACONDA_USER: labscript-suite

# Configuration for a package with compiled extensions:
Expand Down
21 changes: 14 additions & 7 deletions blacs/__version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
from pathlib import Path
try:
import importlib.metadata as importlib_metadata
Expand All @@ -7,12 +6,20 @@

root = Path(__file__).parent.parent
if (root / '.git').is_dir():
from setuptools_scm import get_version
__version__ = get_version(
root,
version_scheme=os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
local_scheme=os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
)
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__)
Expand Down
66 changes: 65 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,68 @@
requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
[tool.setuptools_scm]
version_scheme = "release-branch-semver"
local_scheme = "no-local-version"

[tool.setuptools]
zip-safe = false
include-package-data = true

[tool.setuptools.packages]
find = {namespaces = false}


[project]
name = "blacs"
description = "Graphical labscript suite experiment queue and hardware interface"
authors = [
{name = "The labscript suite community", email = "[email protected]"},
]
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 = [
"desktop-app>=0.1.2",
"importlib_metadata",
"labscript_utils>=3.1.0b1",
"runmanager>=3.0.0",
"qtutils>=2.2.2",
"zprocess>=2.14.1",
]
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/blacs/"
Downloads = "https://github.com/labscript-suite/blacs/releases/"
Tracker = "https://github.com/labscript-suite/blacs/issues/"

[project.optional-dependencies]
docs = [
"PyQt5",
"Sphinx==7.2.6",
"sphinx-rtd-theme==2.0.0",
"myst_parser==2.0.0",
]

[project.scripts]
blacs = "desktop_app:entry_point"

[project.gui-scripts]
blacs-gui = "desktop_app:entry_point"
50 changes: 0 additions & 50 deletions setup.cfg

This file was deleted.

9 changes: 0 additions & 9 deletions setup.py

This file was deleted.

0 comments on commit 7a84e38

Please sign in to comment.