diff --git a/jill/config/releases.csv b/jill/config/releases.csv old mode 100644 new mode 100755 index a5fb5d5..bcddddc --- a/jill/config/releases.csv +++ b/jill/config/releases.csv @@ -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 diff --git a/jill/tests/tests_versions.py b/jill/tests/tests_versions.py index cd92d53..7c13205 100644 --- a/jill/tests/tests_versions.py +++ b/jill/tests/tests_versions.py @@ -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") @@ -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") @@ -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") diff --git a/jill/utils/version_utils.py b/jill/utils/version_utils.py index fdb3779..a8aa721 100644 --- a/jill/utils/version_utils.py +++ b/jill/utils/version_utils.py @@ -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) @@ -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) @@ -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) @@ -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. diff --git a/setup.py b/setup.py index ebd5079..0586cb4 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setuptools.setup( name='jill', - version='0.6.6', + version='0.6.7', author="Johnny Chen", author_email="johnnychen94@hotmail.com", description="JILL -- Julia Installer for Linux (MacOS, Windows and FreeBSD) -- Light",