Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read Package Version Better #1415

Merged
merged 7 commits into from
Jul 31, 2024
Merged

Read Package Version Better #1415

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f23c7ce
read version from _version.py file
eitanturok Jul 31, 2024
961e3a9
format + lint
Jul 31, 2024
6f305f3
fix typo + type check
Jul 31, 2024
9a01a8f
add imports
Jul 31, 2024
20c8100
Update llmfoundry/_version.py
eitanturok Jul 31, 2024
ac1dd82
add imports
Jul 31, 2024
0b84d4c
include __version__ in all
Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions llmfoundry/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,3 @@
'tokenizers',
'utils',
]

__version__ = '0.11.0.dev0'
eitanturok marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 6 additions & 0 deletions llmfoundry/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright 2024 MosaicML LLM Foundry authors
# SPDX-License-Identifier: Apache-2.0

"""The LLM Foundry Version."""

__version__ = '0.10.0'
eitanturok marked this conversation as resolved.
Show resolved Hide resolved
18 changes: 8 additions & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import copy
import os
import re
from typing import Any, Dict, Mapping

import setuptools
from setuptools import setup
Expand All @@ -15,17 +15,15 @@
_REPO_REAL_PATH = os.path.dirname(os.path.realpath(__file__))
_PACKAGE_REAL_PATH = os.path.join(_REPO_REAL_PATH, _PACKAGE_DIR)

# Read the repo version
# Read the composer version
eitanturok marked this conversation as resolved.
Show resolved Hide resolved
# We can't use `.__version__` from the library since it's not installed yet
with open(os.path.join(_PACKAGE_REAL_PATH, '__init__.py')) as f:
version_path = os.path.join(_PACKAGE_REAL_PATH, '_version.py')
with open(version_path, encoding='utf-8') as f:
version_globals: Dict[str, Any] = {}
version_locals: Mapping[str, object] = {}
content = f.read()
# regex: '__version__', whitespace?, '=', whitespace, quote, version, quote
# we put parens around the version so that it becomes elem 1 of the match
expr = re.compile(
r"""^__version__\s*=\s*['"]([0-9]+\.[0-9]+\.[0-9]+(?:\.\w+)?)['"]""",
re.MULTILINE,
)
repo_version = expr.findall(content)[0]
exec(content, version_globals, version_locals)
repo_version = version_locals['__version__']

# Use repo README for PyPi description
with open('README.md', 'r', encoding='utf-8') as fh:
Expand Down
Loading