Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Software
idms-linux-installer
Commits
ddd1867d
Commit
ddd1867d
authored
Jun 30, 2020
by
Nigel Kukard
Browse files
Move __version__ to main package and use in setup.py
parent
2751c5d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
setup.py
View file @
ddd1867d
...
...
@@ -15,10 +15,14 @@
"""IDMS Linux Installer."""
import
re
from
setuptools
import
find_packages
,
setup
main_py
=
open
(
'src/idmslinux_installer/__init__.py'
).
read
()
metadata
=
dict
(
re
.
findall
(
"__([a-z]+)__ = '([^']+)'"
,
main_py
))
NAME
=
'idmslinux_installer'
VERSION
=
'0.0.1'
VERSION
=
metadata
[
'version'
]
setup
(
name
=
NAME
,
...
...
src/idmslinux_installer/__init__.py
View file @
ddd1867d
...
...
@@ -14,3 +14,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""IDMS Linux Installer package."""
__version__
=
'0.2.0'
src/idmslinux_installer/commandline.py
View file @
ddd1867d
...
...
@@ -17,7 +17,8 @@
import
argparse
from
idmslinux_installer.ili
import
Ili
,
__version__
import
idmslinux_installer
from
idmslinux_installer.ili
import
Ili
def
main
():
...
...
src/idmslinux_installer/ili.py
View file @
ddd1867d
...
...
@@ -26,12 +26,11 @@ from typing import Any, Optional
import
requests
from
dialog
import
Dialog
# type: ignore
import
idmslinux_installer
from
idmslinux_installer.ilistate
import
IliState
from
idmslinux_installer.plugin
import
PluginCollection
from
idmslinux_installer.util.blockdevices
import
BlockDevices
__version__
=
"0.1.7"
# pylama:ignore=C901,R0903,R0912,R0915
class
Ili
:
...
...
@@ -65,7 +64,7 @@ class Ili:
# Fire up Dialog
self
.
_dialog
=
Dialog
(
dialog
=
'dialog'
,
autowidgetsize
=
True
)
self
.
_dialog
.
set_background_title
(
f
'IDMS Linux Installer v
{
__version__
}
'
)
self
.
_dialog
.
set_background_title
(
f
'IDMS Linux Installer v
{
idmslinux_installer
.
__version__
}
'
)
self
.
_textmode
=
True
self
.
_percent_done
=
0
...
...
@@ -181,7 +180,7 @@ class Ili:
if
re
.
match
(
'^https?://'
,
preseed_uri
):
try
:
# Grab HTTP resource
resource
=
requests
.
get
(
preseed_uri
,
headers
=
{
'User-Agent'
:
f
'Ili/
{
__version__
}
'
})
resource
=
requests
.
get
(
preseed_uri
,
headers
=
{
'User-Agent'
:
f
'Ili/
{
idmslinux_installer
.
__version__
}
'
})
config_data
=
resource
.
text
except
requests
.
exceptions
.
RequestException
as
exception
:
self
.
_critical_error
(
'Error loading preseed'
,
str
(
exception
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment