Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jochym committed Apr 15, 2024
1 parent ab22eea commit a9804a9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 125 deletions.
2 changes: 0 additions & 2 deletions .bzrignore

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
with:
name: python-package-distributions
path: dist/

- name: Publish distribution to TestPyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down
68 changes: 0 additions & 68 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* v5.1.2
- New build infrastructure (github actions)
- Changelog ;)
3 changes: 0 additions & 3 deletions old_setup.cfg

This file was deleted.

54 changes: 2 additions & 52 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
# -*- coding: utf-8 -*-

# from setuptools import setup, find_packages
# from setuptools_scm import get_version

# def clean_version(version: ScmVersion) -> str:
# from setuptools_scm.version import guess_next_version

# return version.format_next_version(guess_next_version, "{guessed}b{distance}")


# setup(use_scm_version={"version_scheme": myversion_func})


# we presume installed build dependencies
from __future__ import annotations

from setuptools import setup

from setuptools_scm import ScmVersion


def clean_version(version: ScmVersion) -> str:
from setuptools_scm.version import guess_next_version

print("Building version:", version.format_next_version(guess_next_version, "{guessed}.{distance}"))

return version.format_next_version(guess_next_version, "{guessed}.{distance}")
return version.format_next_version(guess_next_version,
"{guessed}.{distance}")


def no_local(version) -> str:
Expand All @@ -34,37 +18,3 @@ def no_local(version) -> str:
setup(use_scm_version={"version_scheme": clean_version,
"local_scheme": no_local})

# ver = get_version().split('+')[0].split('.')

# if ver[-1].startswith('dev'):
# ver[-1] = ver[-1][3:]
# ver[-2] = str(int(ver[-2])-1)

# ver = '.'.join(ver)

# print("Building version:", ver)

# setup(
# name='elastic',
# version=ver,
# packages=find_packages(),
# license='GPLv3',
# description='Extension for ASE to calculate elastic constants',
# long_description=open('README.md', 'rb').read().decode('utf-8'),
# long_description_content_type='text/markdown',
# author='Paweł T. Jochym',
# author_email='[email protected]',
# url='https://github.com/jochym/Elastic',
# keywords=['science', 'physics', 'ase', 'elastic constants', 'crystals'],
# requires=['click', 'spglib', 'numpy', 'scipy', 'ase'],
# setup_requires=['docutils', 'sphinx', 'setuptools_scm'],
# provides=['elastic', 'parcalc'],
# platforms=['all'],
# classifiers=[],
# include_package_data=True,
# install_requires=['click', ],
# entry_points='''
# [console_scripts]
# elastic=elastic.cli.elastic:cli
# '''
# )

0 comments on commit a9804a9

Please sign in to comment.