Skip to content

Commit

Permalink
Merge pull request #232 from scipion-em/jj_add_requirements
Browse files Browse the repository at this point in the history
Add requirements
  • Loading branch information
pconesa authored Nov 30, 2023
2 parents 8718049 + 69ce17f commit 17c90b1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 3 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
3.3.0:
3.2.2:
- Add requirements
3.2.1:
- Fixing a bug with odd even in tomogram reconstruction
- Tolerating errors in alignment
- Making tomogram reconstruction error tolerant
Expand Down
4 changes: 1 addition & 3 deletions imod/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@

from .constants import IMOD_HOME, ETOMO_CMD, DEFAULT_VERSION, VERSIONS, IMOD_VIEWER_BINNING



__version__ = '3.2.1'
__version__ = '3.2.2'
_logo = "icon.png"
_references = ['Kremer1996', 'Mastronarde2017']

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
scipion-em-tomo
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# **************************************************************************
# *
# * Authors: J.M. De la Rosa Trevin ([email protected]) [1]
# * Authors: Scipion Team ([email protected])
# *
# * [1] SciLifeLab, Stockholm University
# * Unidad de Bioinformatica of Centro Nacional de Biotecnologia , CSIC
# *
# * This program is free software; you can redistribute it and/or modify
# * it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -44,6 +44,9 @@
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()

with open('requirements.txt') as f:
requirements = f.read().splitlines()

# Arguments marked as "Required" below must be included for upload to PyPI.
# Fields marked as "Optional" may be commented out.

Expand Down Expand Up @@ -93,11 +96,11 @@

# This should be your name or the name of the organization which owns the
# project.
author='J.M. De la Rosa, Federico P. de Isidro Gomez', # Optional
author='I2PC', # Optional

# This should be a valid email address corresponding to the author listed
# above.
author_email='[email protected], fp.deisidro@cnb.csic.es', # Optional
author_email='scipion@cnb.csic.es', # Optional

# Classifiers help users find your project by categorizing it.
#
Expand Down

0 comments on commit 17c90b1

Please sign in to comment.