Skip to content

Commit

Permalink
fix release update issue
Browse files Browse the repository at this point in the history 
and update to Julia 1.4.0
  • Loading branch information
@johnnychen94
johnnychen94 committed Mar 22, 2020
1 parent ca522cb commit c0a0814
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 104 deletions.
181 changes: 94 additions & 87 deletions jill/config/releases.csv
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,94 @@
1.0.0,freebsd,x86_64
1.0.1,freebsd,x86_64
1.0.2,freebsd,x86_64
1.0.3,freebsd,x86_64
1.0.4,freebsd,x86_64
1.0.5,freebsd,x86_64
1.1.0,freebsd,x86_64
1.1.1,freebsd,x86_64
1.2.0,freebsd,x86_64
1.3.0,freebsd,x86_64
1.3.1,freebsd,x86_64
latest,freebsd,x86_64
1.0.0,linux,ARMv7
1.0.3,linux,ARMv7
1.0.4,linux,ARMv7
1.0.5,linux,ARMv7
1.1.0,linux,ARMv7
1.2.0,linux,ARMv7
1.3.0,linux,ARMv7
1.3.1,linux,ARMv7
1.0.3,linux,ARMv8
1.0.4,linux,ARMv8
1.0.5,linux,ARMv8
1.1.0,linux,ARMv8
1.1.1,linux,ARMv8
1.2.0,linux,ARMv8
1.3.0,linux,ARMv8
1.3.1,linux,ARMv8
1.0.0,linux,i686
1.0.1,linux,i686
1.0.2,linux,i686
1.0.3,linux,i686
1.0.4,linux,i686
1.0.5,linux,i686
1.1.0,linux,i686
1.1.1,linux,i686
1.2.0,linux,i686
1.3.0,linux,i686
1.3.1,linux,i686
latest,linux,i686
1.0.0,linux,x86_64
1.0.1,linux,x86_64
1.0.2,linux,x86_64
1.0.3,linux,x86_64
1.0.4,linux,x86_64
1.0.5,linux,x86_64
1.1.0,linux,x86_64
1.1.1,linux,x86_64
1.2.0,linux,x86_64
1.3.0,linux,x86_64
1.3.1,linux,x86_64
latest,linux,x86_64
1.0.0,macos,x86_64
1.0.1,macos,x86_64
1.0.2,macos,x86_64
1.0.3,macos,x86_64
1.0.4,macos,x86_64
1.0.5,macos,x86_64
1.1.0,macos,x86_64
1.1.1,macos,x86_64
1.2.0,macos,x86_64
1.3.0,macos,x86_64
latest,macos,x86_64
1.0.0,windows,i686
1.0.1,windows,i686
1.0.2,windows,i686
1.0.3,windows,i686
1.0.4,windows,i686
1.0.5,windows,i686
1.1.0,windows,i686
1.1.1,windows,i686
1.2.0,windows,i686
1.3.0,windows,i686
1.3.1,windows,i686
latest,windows,i686
1.0.0,windows,x86_64
1.0.1,windows,x86_64
1.0.2,windows,x86_64
1.0.3,windows,x86_64
1.0.4,windows,x86_64
1.0.5,windows,x86_64
1.1.0,windows,x86_64
1.1.1,windows,x86_64
1.2.0,windows,x86_64
1.3.0,windows,x86_64
1.3.1,windows,x86_64
latest,windows,x86_64
1.0.0,freebsd,x86_64
1.0.1,freebsd,x86_64
1.0.2,freebsd,x86_64
1.0.3,freebsd,x86_64
1.0.4,freebsd,x86_64
1.0.5,freebsd,x86_64
1.1.0,freebsd,x86_64
1.1.1,freebsd,x86_64
1.2.0,freebsd,x86_64
1.3.0,freebsd,x86_64
1.3.1,freebsd,x86_64
1.4.0,freebsd,x86_64
latest,freebsd,x86_64
1.0.0,linux,ARMv7
1.0.3,linux,ARMv7
1.0.4,linux,ARMv7
1.0.5,linux,ARMv7
1.1.0,linux,ARMv7
1.2.0,linux,ARMv7
1.3.0,linux,ARMv7
1.3.1,linux,ARMv7
1.0.3,linux,ARMv8
1.0.4,linux,ARMv8
1.0.5,linux,ARMv8
1.1.0,linux,ARMv8
1.1.1,linux,ARMv8
1.2.0,linux,ARMv8
1.3.0,linux,ARMv8
1.3.1,linux,ARMv8
1.4.0,linux,ARMv8
1.0.0,linux,i686
1.0.1,linux,i686
1.0.2,linux,i686
1.0.3,linux,i686
1.0.4,linux,i686
1.0.5,linux,i686
1.1.0,linux,i686
1.1.1,linux,i686
1.2.0,linux,i686
1.3.0,linux,i686
1.3.1,linux,i686
latest,linux,i686
1.0.0,linux,x86_64
1.0.1,linux,x86_64
1.0.2,linux,x86_64
1.0.3,linux,x86_64
1.0.4,linux,x86_64
1.0.5,linux,x86_64
1.1.0,linux,x86_64
1.1.1,linux,x86_64
1.2.0,linux,x86_64
1.3.0,linux,x86_64
1.3.1,linux,x86_64
1.4.0,linux,x86_64
latest,linux,x86_64
1.0.0,macos,x86_64
1.0.1,macos,x86_64
1.0.2,macos,x86_64
1.0.3,macos,x86_64
1.0.4,macos,x86_64
1.0.5,macos,x86_64
1.1.0,macos,x86_64
1.1.1,macos,x86_64
1.2.0,macos,x86_64
1.3.0,macos,x86_64
1.3.1,macos,x86_64
1.4.0,macos,x86_64
latest,macos,x86_64
1.0.0,windows,i686
1.0.1,windows,i686
1.0.2,windows,i686
1.0.3,windows,i686
1.0.4,windows,i686
1.0.5,windows,i686
1.1.0,windows,i686
1.1.1,windows,i686
1.2.0,windows,i686
1.3.0,windows,i686
1.3.1,windows,i686
1.4.0,windows,i686
latest,windows,i686
1.0.0,windows,x86_64
1.0.1,windows,x86_64
1.0.2,windows,x86_64
1.0.3,windows,x86_64
1.0.4,windows,x86_64
1.0.5,windows,x86_64
1.1.0,windows,x86_64
1.1.1,windows,x86_64
1.2.0,windows,x86_64
1.3.0,windows,x86_64
1.3.1,windows,x86_64
1.4.0,windows,x86_64
latest,windows,x86_64
9 changes: 0 additions & 9 deletions jill/tests/tests_versions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ def test_latest_version(self):
self.assertEqual(
latest_version("1.1", "windows", "x86_64"),
"1.1.1")
self.assertEqual(
latest_version("1.0.5", "windows", "x86_64"),
"1.0.5")
self.assertEqual(
latest_version("1.4.0-rc1", "windows", "x86_64"),
"1.4.0-rc1")
Expand All @@ -31,9 +28,6 @@ def test_latest_major_version(self):
self.assertEqual(
latest_major_version("latest", "windows", "x86_64"),
"latest")
self.assertEqual(
latest_major_version("1.0.5", "windows", "x86_64"),
"1.0.5")
self.assertEqual(
latest_major_version("1.4.0-rc1", "windows", "x86_64"),
"1.4.0-rc1")
Expand All @@ -45,9 +39,6 @@ def test_latest_minor_version(self):
self.assertEqual(
latest_minor_version("latest", "windows", "x86_64"),
"latest")
self.assertEqual(
latest_minor_version("1.0.5", "windows", "x86_64"),
"1.0.5")
self.assertEqual(
latest_minor_version("1.4.0-rc1", "windows", "x86_64"),
"1.4.0-rc1")
Expand Down
11 changes: 4 additions & 7 deletions jill/utils/version_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def is_version_released(version, system, architecture,
if rst:
logging.info(f"get new release {item}")
try:
os.chmod(RELEASE_CONFIGFILE, mode=0o755) # TODO: put this line to the "right" place
with open(RELEASE_CONFIGFILE, 'a') as csvfile:
writer = csv.writer(csvfile)
writer.writerow(item)
Expand Down Expand Up @@ -169,9 +170,7 @@ def latest_minor_version(version, system, architecture, **kwargs) -> str:
"""
return the latest X.y.z version starting from input version X
"""
# if user passes a complete version here, then we don't need to query
# from local storage, just trying to download it would be fine.
if is_full_version(version):
if version == "latest":
return version

# TODO: this is only useful for ARM, remove it (#16)
Expand All @@ -195,9 +194,7 @@ def latest_major_version(version, system, architecture, **kwargs) -> str:
"""
return the latest x.y.z version
"""
# if user passes a complete version here, then we don't need to query
# from local storage, just trying to download it would be fine.
if is_full_version(version):
if version == "latest":
return version

# TODO: this is only useful for ARM, remove it (#16)
Expand All @@ -221,7 +218,7 @@ def latest_major_version(version, system, architecture, **kwargs) -> str:
return latest_patch


def latest_version(version, system, architecture, **kwargs) -> str:
def latest_version(version, system, architecture, update=True, **kwargs) -> str:
"""
find the latest version for partial semantic version string. Directly
return `version` if it's already a complete version string.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

setuptools.setup(
name='jill',
version='0.6.6',
version='0.6.7',
author="Johnny Chen",
author_email="[email protected]",
description="JILL -- Julia Installer for Linux (MacOS, Windows and FreeBSD) -- Light",
Expand Down

0 comments on commit c0a0814

Please sign in to comment.