Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Merged PR 80808: InQRy 1.3.2
Browse files Browse the repository at this point in the history
- Bump vers to 1.3.2 and catch exception if plist is not present for pip3 install
- ~~Add back Portable to dropdown~~ Removal of Portable to drop down
- Remove "Show" button from GUI
  • Loading branch information
Eric Hanko authored and jazaval committed Aug 31, 2017
2 parents eb60e81 + a3d415c commit e5c9641
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
3 changes: 2 additions & 1 deletion inqry/form_instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ def __init__(self, specs: SystemSpecs):
self.processor = '{} {}'.format(specs.processor_speed, specs.processor_name)
self.form_types = {'Desktop': [self.processor, specs.memory,
specs.drive1, specs.drive2,
specs.drive3, specs.drive4],}
specs.drive3, specs.drive4]
}
self.model_identifier = specs.model_identifier
self.model_name = specs.model_name
self.serial_number = specs.serial_number
Expand Down
18 changes: 10 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
except ImportError:
from distutils.core import setup

__version__ = '1.3.1'
__version__ = '1.3.2'
__author__ = "Microsoft Apex Lab"
__copyright__ = 'Copyright © 2017 Microsoft. All rights reserved.'
__credits__ = ["Eric Hanko", "Jacob Zaval", "Michael Brown", "Andre Shields", "Ryan Dominguez", "Eammon Hanlon"]
Expand All @@ -20,13 +20,15 @@
assets into a Snipe-IT database.
'''

plist = Plist.fromFile('Info.plist')
plist.update(dict(
CFBundleVersion=__version__,
CFBundleShortVersionString=__version__,
CFBundleName='InQRy',
NSHumanReadableCopyright=__copyright__)
)
try:
plist = Plist.fromFile('Info.plist')
plist.update(dict(
CFBundleVersion=__version__,
CFBundleShortVersionString=__version__,
CFBundleName='InQRy',
NSHumanReadableCopyright=__copyright__))
except FileNotFoundError:
plist = None

setup(
name='inqry',
Expand Down

0 comments on commit e5c9641

Please sign in to comment.