Skip to content

Commit

Permalink
update package / install info
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Cleeve committed Oct 3, 2022
1 parent 1f50be6 commit 4fb83af
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 132 deletions.
13 changes: 0 additions & 13 deletions .coveragerc

This file was deleted.

10 changes: 0 additions & 10 deletions .flake8

This file was deleted.

42 changes: 17 additions & 25 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
BSD 3-Clause License
MIT License

Copyright (c) 2020, Genevieve Buckley
All rights reserved.
Copyright (c) 2022 DeMarcoLab

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
11 changes: 0 additions & 11 deletions requirements.txt

This file was deleted.

31 changes: 21 additions & 10 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
[versioneer]
VCS = git
style = pep440-post
versionfile_source = liftout/_version.py
versionfile_build = liftout/_version.py
tag_prefix = v
[metadata]
name = autoliftout
version = 0.0.1
author = Patrick Cleeve
author_email = [email protected]
description = automated cryo-liftout
long_description = file: README.md
long_description_content_type = text/markdown
url = https://github.com/DeMarcoLab/autoliftout
project_urls =
Bug Tracker = https://github.com/DeMarcoLab/autoliftout/issues
classifiers =
Programming Language :: Python :: 3
License :: OSI Approved :: MIT License
Operating System :: OS Independent

[bdist_wheel]
universal = 1
[options]
packages = find:
python_requires = >=3.9

[flake8]
exclude = docs / conf.py
[options.entry_points]
console_scripts =
autoliftout_ui = autoliftout.gui.main:main
65 changes: 2 additions & 63 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,63 +1,2 @@
from os import path
from setuptools import setup, find_packages
import sys
import versioneer


# NOTE: This file must remain Python 2 compatible for the foreseeable future,
# to ensure that we error out properly for people with outdated setuptools
# and/or pip.
min_version = (3, 6)
if sys.version_info < min_version:
error = """
liftout does not support Python {0}.{1}.
Python {2}.{3} and above is required. Check your Python version like so:
python3 --version
This may be due to an out-of-date pip. Make sure you have pip >= 9.0.1.
Upgrade pip like so:
pip install --upgrade pip
""".format(*(sys.version_info[:2] + min_version))
sys.exit(error)

here = path.abspath(path.dirname(__file__))

with open(path.join(here, 'README.md'), encoding='utf-8') as readme_file:
readme = readme_file.read()

with open(path.join(here, 'requirements.txt')) as requirements_file:
# Parse requirements.txt, ignoring any commented-out lines.
requirements = [line for line in requirements_file.read().splitlines()
if not line.startswith('#')]


setup(
name='liftout',
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
description="Automated cryo-liftout for electron microscopy.",
long_description=readme,
author="Genevieve Buckley",
author_email='',
url='https://github.com/GenevieveBuckley/liftout',
python_requires='>={}'.format('.'.join(str(n) for n in min_version)),
packages=find_packages(exclude=['docs', 'tests']),
entry_points={"console_scripts": ["liftout = liftout.main:main_cli"]},
include_package_data=True,
package_data={
'liftout': [
# When adding files here, remember to update MANIFEST.in as well,
# or else they will not be included in the distribution on PyPI!
# 'path/to/data_file',
]
},
install_requires=requirements,
license="BSD (3-clause)",
classifiers=[
'Development Status :: 2 - Pre-Alpha',
'Natural Language :: English',
'Programming Language :: Python :: 3',
],
)
import setuptools
setuptools.setup()

0 comments on commit 4fb83af

Please sign in to comment.