Skip to content

Commit

Permalink
Merge pull request #2581 from Kodiologist/simple-versioning
Browse files Browse the repository at this point in the history
Simplify versioning
  • Loading branch information
Kodiologist committed May 5, 2024
2 parents 5784c1f + d5ddfc6 commit 5461f6f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 46 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/hy/version.py
*.pyc
.*.sw?
*hy*egg*
Expand Down
8 changes: 3 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@
for c in (SD.RemovedInSphinx60Warning, SD.RemovedInSphinx70Warning):
warnings.filterwarnings('ignore', category = c)

from get_version import __version__ as hy_version

project = 'Hy'
copyright = '%s the authors' % time.strftime('%Y')
html_title = f'Hy {hy_version} manual'
version = '.'.join(hy_version.split('.')[:-1])
html_title = f'Hy {hy.__version__} manual'
version = '.'.join(hy.__version__.split('.')[:-1])
# The short dotted version identifier
release = hy_version
release = hy.__version__
# The full version identifier, including alpha, beta, and RC tags

hyrule_version = 'doc-testing'
Expand Down
29 changes: 0 additions & 29 deletions get_version.py

This file was deleted.

5 changes: 1 addition & 4 deletions hy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
try:
from hy.version import __version__
except ImportError:
__version__ = "unknown"
__version__ = 'unreleased'


def _initialize_env_var(env_var, default_val):
Expand Down
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import os

import fastentrypoints # Monkey-patches setuptools.
from get_version import __version__
from setuptools import find_packages, setup
from setuptools.command.install import install

Expand Down Expand Up @@ -42,11 +41,7 @@ def run(self):

setup(
name=PKG,
version=(
None
if __version__ == "unknown"
else __version__
),
version='0.0.0',
setup_requires=["wheel"] + requires,
install_requires=requires,
python_requires=">= 3.8, < 3.13",
Expand All @@ -61,7 +56,6 @@ def run(self):
package_data={
"": ["*.hy"],
},
data_files=[("get_version", ["get_version.py"])],
author="Paul Tagliamonte",
author_email="tag@pault.ag",
long_description=long_description,
Expand Down

0 comments on commit 5461f6f

Please sign in to comment.