Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Co-authored-by: Nir Cohen <nir0s@users.noreply.github.com>
  • Loading branch information
jdufresne and nir0s authored Jul 1, 2021
1 parent 39b1481 commit 18cb594
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 61 deletions.
90 changes: 45 additions & 45 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
## 1.5.0 (2020.3.30)

BACKWARD COMPATIBILITY:
* Keep output as native string so we can compatible with python2 interface [[#248](https://github.com/nir0s/distro/pull/248)]
* Keep output as native string so we can compatible with python2 interface [[#248](https://github.com/python-distro/distro/pull/248)]

ENHANCEMENTS:

BUG FIXES:
* Fix detection of RHEL 6 ComputeNode [[#255](https://github.com/nir0s/distro/issues/255)]
* Fix Oracle 4/5 lsb_release id and names [[#250](https://github.com/nir0s/distro/pull/250)]
* Ignore /etc/plesk-release file while parsing distribution [[#246](https://github.com/nir0s/distro/pull/246)]
* Fix detection of RHEL 6 ComputeNode [[#255](https://github.com/python-distro/distro/issues/255)]
* Fix Oracle 4/5 lsb_release id and names [[#250](https://github.com/python-distro/distro/pull/250)]
* Ignore /etc/plesk-release file while parsing distribution [[#246](https://github.com/python-distro/distro/pull/246)]

TESTS:
* Test on MidnightBSD [[#254](https://github.com/nir0s/distro/issues/254)]
* Test on MidnightBSD [[#254](https://github.com/python-distro/distro/issues/254)]

RELEASE:
* Remove build testing on Python 3.3 and add pypy 3.5 and Python 3.7 and 3.8 [[#244](https://github.com/nir0s/distro/pull/244)]
* Fix Windows build due to Appveyor not supporting builds on Python 2.7 anymore [[#257](https://github.com/nir0s/distro/pull/257)]
* Remove build testing on Python 3.3 and add pypy 3.5 and Python 3.7 and 3.8 [[#244](https://github.com/python-distro/distro/pull/244)]
* Fix Windows build due to Appveyor not supporting builds on Python 2.7 anymore [[#257](https://github.com/python-distro/distro/pull/257)]

Additionally, The Python2.6 branch was fixed to support distro version 1.4.0. It is now passing all tests. Thanks [abadger](https://github.com/abadger)!

## 1.4.0 (2019.2.4)

BACKWARD COMPATIBILITY:
* Prefer the VERSION_CODENAME field of os-release to parsing it from VERSION [[#230](https://github.com/nir0s/distro/pull/230)]
* Prefer the VERSION_CODENAME field of os-release to parsing it from VERSION [[#230](https://github.com/python-distro/distro/pull/230)]

BUG FIXES:
* Return _uname_info from the uname_info() method [[#233](https://github.com/nir0s/distro/pull/233)]
* Fixed CloudLinux id discovery [[#234](https://github.com/nir0s/distro/pull/234)]
* Update Oracle matching [[#224](https://github.com/nir0s/distro/pull/224)]
* Return _uname_info from the uname_info() method [[#233](https://github.com/python-distro/distro/pull/233)]
* Fixed CloudLinux id discovery [[#234](https://github.com/python-distro/distro/pull/234)]
* Update Oracle matching [[#224](https://github.com/python-distro/distro/pull/224)]

DOCS:
* Update Fedora package link [[#225](https://github.com/nir0s/distro/pull/225)]
* Distro is the recommended replacement for platform.linux_distribution [[#220](https://github.com/nir0s/distro/pull/220)]
* Update Fedora package link [[#225](https://github.com/python-distro/distro/pull/225)]
* Distro is the recommended replacement for platform.linux_distribution [[#220](https://github.com/python-distro/distro/pull/220)]

RELEASE:
* Use Markdown for long description in setup.py [[#219](https://github.com/nir0s/distro/pull/219)]
* Use Markdown for long description in setup.py [[#219](https://github.com/python-distro/distro/pull/219)]

Additionally, The Python2.6 branch was fixed and rebased on top of master. It is now passing all tests. Thanks [abadger](https://github.com/abadger)!

## 1.3.0 (2018.05.09)

ENHANCEMENTS:
* Added support for OpenBSD, FreeBSD, and NetBSD [[#207](https://github.com/nir0s/distro/issues/207)]
* Added support for OpenBSD, FreeBSD, and NetBSD [[#207](https://github.com/python-distro/distro/issues/207)]

TESTS:
* Add test for Kali Linux Rolling [[#214](https://github.com/nir0s/distro/issues/214)]
* Add test for Kali Linux Rolling [[#214](https://github.com/python-distro/distro/issues/214)]

DOCS:
* Update docs with regards to #207 [[#209](https://github.com/nir0s/distro/issues/209)]
* Add Ansible reference implementation and fix arch-linux link [[#213](https://github.com/nir0s/distro/issues/213)]
* Add facter reference implementation [[#213](https://github.com/nir0s/distro/issues/213)]
* Update docs with regards to #207 [[#209](https://github.com/python-distro/distro/issues/209)]
* Add Ansible reference implementation and fix arch-linux link [[#213](https://github.com/python-distro/distro/issues/213)]
* Add facter reference implementation [[#213](https://github.com/python-distro/distro/issues/213)]

## 1.2.0 (2017.12.24)

BACKWARD COMPATIBILITY:
* Don't raise ImportError on non-linux platforms [[#202](https://github.com/nir0s/distro/issues/202)]
* Don't raise ImportError on non-linux platforms [[#202](https://github.com/python-distro/distro/issues/202)]

ENHANCEMENTS:
* Lazily load the LinuxDistribution data [[#201](https://github.com/nir0s/distro/issues/201)]
* Lazily load the LinuxDistribution data [[#201](https://github.com/python-distro/distro/issues/201)]

BUG FIXES:
* Stdout of shell should be decoded with sys.getfilesystemencoding() [[#203](https://github.com/nir0s/distro/issues/203)]
* Stdout of shell should be decoded with sys.getfilesystemencoding() [[#203](https://github.com/python-distro/distro/issues/203)]

TESTS:
* Explicitly set Python versions on Travis for flake [[#204](https://github.com/nir0s/distro/issues/204)]
* Explicitly set Python versions on Travis for flake [[#204](https://github.com/python-distro/distro/issues/204)]


## 1.1.0 (2017.11.28)

BACKWARD COMPATIBILITY:
* Drop python3.3 support [[#199](https://github.com/nir0s/distro/issues/199)]
* Remove Official Python26 support [[#195](https://github.com/nir0s/distro/issues/195)]
* Drop python3.3 support [[#199](https://github.com/python-distro/distro/issues/199)]
* Remove Official Python26 support [[#195](https://github.com/python-distro/distro/issues/195)]

TESTS:
* Add MandrivaLinux test case [[#181](https://github.com/nir0s/distro/issues/181)]
* Add test cases for CloudLinux 5, 6, and 7 [[#180](https://github.com/nir0s/distro/issues/180)]
* Add MandrivaLinux test case [[#181](https://github.com/python-distro/distro/issues/181)]
* Add test cases for CloudLinux 5, 6, and 7 [[#180](https://github.com/python-distro/distro/issues/180)]

RELEASE:
* Modify MANIFEST to include resources for tests and docs in source tarballs [[97c91a1](97c91a1)]

## 1.0.4 (2017.04.01)

BUG FIXES:
* Guess common *-release files if /etc not readable [[#175](https://github.com/nir0s/distro/issues/175)]
* Guess common *-release files if /etc not readable [[#175](https://github.com/python-distro/distro/issues/175)]

## 1.0.3 (2017.03.19)

ENHANCEMENTS:
* Show keys for empty values when running distro from the CLI [[#160](https://github.com/nir0s/distro/issues/160)]
* Add manual mapping for `redhatenterpriseserver` (previously only redhatenterpriseworkstation was mapped) [[#148](https://github.com/nir0s/distro/issues/148)]
* Race condition in `_parse_distro_release_file` [[#163](https://github.com/nir0s/distro/issues/163)]
* Show keys for empty values when running distro from the CLI [[#160](https://github.com/python-distro/distro/issues/160)]
* Add manual mapping for `redhatenterpriseserver` (previously only redhatenterpriseworkstation was mapped) [[#148](https://github.com/python-distro/distro/issues/148)]
* Race condition in `_parse_distro_release_file` [[#163](https://github.com/python-distro/distro/issues/163)]

TESTS:
* Add RHEL5 test case [[#165](https://github.com/nir0s/distro/issues/165)]
* Add OpenELEC test case [[#166](https://github.com/nir0s/distro/issues/166)]
* Replace nose with pytest [[#158](https://github.com/nir0s/distro/issues/158)]
* Add RHEL5 test case [[#165](https://github.com/python-distro/distro/issues/165)]
* Add OpenELEC test case [[#166](https://github.com/python-distro/distro/issues/166)]
* Replace nose with pytest [[#158](https://github.com/python-distro/distro/issues/158)]

RELEASE:
* Update classifiers
Expand All @@ -106,33 +106,33 @@ TESTS:
* Test on py33, py36 and py3 based flake8

RELEASE:
* Add MANIFEST file (which also includes the LICENSE as part of Issue [[#139](https://github.com/nir0s/distro/issues/139)])
* Default to releasing using Twine [[#121](https://github.com/nir0s/distro/issues/121)]
* Add setup.cfg file [[#145](https://github.com/nir0s/distro/issues/145)]
* Add MANIFEST file (which also includes the LICENSE as part of Issue [[#139](https://github.com/python-distro/distro/issues/139)])
* Default to releasing using Twine [[#121](https://github.com/python-distro/distro/issues/121)]
* Add setup.cfg file [[#145](https://github.com/python-distro/distro/issues/145)]
* Update license in setup.py

## 1.0.1 (2016-11-03)

ENHANCEMENTS:
* Prettify distro -j's output and add more elaborate docs [[#147](https://github.com/nir0s/distro/issues/147)]
* Decode output of `lsb_release` as utf-8 [[#144](https://github.com/nir0s/distro/issues/144)]
* Logger now uses `message %s, string` form to not-evaulate log messages if unnecessary [[#145](https://github.com/nir0s/distro/issues/145)]
* Prettify distro -j's output and add more elaborate docs [[#147](https://github.com/python-distro/distro/issues/147)]
* Decode output of `lsb_release` as utf-8 [[#144](https://github.com/python-distro/distro/issues/144)]
* Logger now uses `message %s, string` form to not-evaulate log messages if unnecessary [[#145](https://github.com/python-distro/distro/issues/145)]

TESTS:
* Increase code-coverage [[#146](https://github.com/nir0s/distro/issues/146)]
* Fix landscape code-quality warnings [[#145](https://github.com/nir0s/distro/issues/145)]
* Increase code-coverage [[#146](https://github.com/python-distro/distro/issues/146)]
* Fix landscape code-quality warnings [[#145](https://github.com/python-distro/distro/issues/145)]

RELEASE:
* Add CONTRIBUTING.md

## 1.0.0 (2016-09-25)

BACKWARD COMPATIBILITY:
* raise exception when importing on non-supported platforms [[#129](https://github.com/nir0s/distro/issues/129)]
* raise exception when importing on non-supported platforms [[#129](https://github.com/python-distro/distro/issues/129)]

ENHANCEMENTS:
* Use `bytes` invariantly [[#135](https://github.com/nir0s/distro/issues/135)]
* Some minor code adjustments plus a CLI [[#134](https://github.com/nir0s/distro/issues/134)]
* Use `bytes` invariantly [[#135](https://github.com/python-distro/distro/issues/135)]
* Some minor code adjustments plus a CLI [[#134](https://github.com/python-distro/distro/issues/134)]
* Emit stderr if `lsb_release` fails

BUG FIXES:
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Distro - an OS platform information API
[![CI Status](https://github.com/python-distro/distro/workflows/CI/badge.svg)](https://github.com/python-distro/distro/actions/workflows/ci.yaml)
[![PyPI version](http://img.shields.io/pypi/v/distro.svg)](https://pypi.python.org/pypi/distro)
[![Supported Python Versions](https://img.shields.io/pypi/pyversions/distro.svg)](https://img.shields.io/pypi/pyversions/distro.svg)
[![Requirements Status](https://requires.io/github/nir0s/distro/requirements.svg?branch=master)](https://requires.io/github/nir0s/distro/requirements/?branch=master)
[![Code Coverage](https://codecov.io/github/nir0s/distro/coverage.svg?branch=master)](https://codecov.io/github/nir0s/distro?branch=master)
[![Code Quality](https://landscape.io/github/nir0s/distro/master/landscape.svg?style=flat)](https://landscape.io/github/nir0s/distro)
[![Requirements Status](https://requires.io/github/python-distro/distro/requirements.svg?branch=master)](https://requires.io/github/python-distro/distro/requirements/?branch=master)
[![Code Coverage](https://codecov.io/github/python-distro/distro/coverage.svg?branch=master)](https://codecov.io/github/python-distro/distro?branch=master)
[![Code Quality](https://landscape.io/github/python-distro/distro/master/landscape.svg?style=flat)](https://landscape.io/github/python-distro/distro)
[![Is Wheel](https://img.shields.io/pypi/wheel/distro.svg?style=flat)](https://pypi.python.org/pypi/distro)
[![Latest Github Release](https://readthedocs.org/projects/distro/badge/?version=stable)](http://distro.readthedocs.io/en/latest/)
[![Join the chat at https://gitter.im/nir0s/distro](https://badges.gitter.im/nir0s/distro.svg)](https://gitter.im/nir0s/distro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://gitter.im/python-distro/distro](https://badges.gitter.im/python-distro/distro.svg)](https://gitter.im/python-distro/distro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

`distro` provides information about the
OS distribution it runs on, such as a reliable machine-readable ID, or
Expand All @@ -21,9 +21,9 @@ function (which will be removed in Python 3.8).
It also provides much more functionality which isn't necessarily Python bound,
like a command-line interface.

Distro currently supports Linux and BSD based systems but [Windows and OS X support](https://github.com/nir0s/distro/issues/177) is also planned.
Distro currently supports Linux and BSD based systems but [Windows and OS X support](https://github.com/python-distro/distro/issues/177) is also planned.

For Python 2.6 support, see https://github.com/nir0s/distro/tree/python2.6-support
For Python 2.6 support, see https://github.com/python-distro/distro/tree/python2.6-support

## Installation

Expand All @@ -36,7 +36,7 @@ pip install distro
Installation of the latest development version:

```shell
pip install https://github.com/nir0s/distro/archive/master.tar.gz
pip install https://github.com/python-distro/distro/archive/master.tar.gz
```


Expand Down Expand Up @@ -100,13 +100,13 @@ namely from these data sources (from high to low precedence):
any distribution that provides one or more of the data sources
covered.

This package is tested with test data that mimics the exact behavior of the data sources of [a number of Linux distributions](https://github.com/nir0s/distro/tree/master/tests/resources/distros).
This package is tested with test data that mimics the exact behavior of the data sources of [a number of Linux distributions](https://github.com/python-distro/distro/tree/master/tests/resources/distros).


## Testing

```shell
git clone git@github.com:nir0s/distro.git
git clone git@github.com:python-distro/distro.git
cd distro
pip install tox
tox
Expand All @@ -118,7 +118,7 @@ tox
Pull requests are always welcome to deal with specific distributions or just
for general merriment.

See [CONTRIBUTIONS](https://github.com/nir0s/distro/blob/master/CONTRIBUTING.md) for contribution info.
See [CONTRIBUTIONS](https://github.com/python-distro/distro/blob/master/CONTRIBUTING.md) for contribution info.

Reference implementations for supporting additional distributions and file
formats can be found here:
Expand Down
2 changes: 1 addition & 1 deletion distro.py
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ def _parse_distro_release_file(self, filepath):
except (OSError, IOError):
# Ignore not being able to read a specific, seemingly version
# related file.
# See https://github.com/nir0s/distro/issues/162
# See https://github.com/python-distro/distro/issues/162
return {}

@staticmethod
Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

.. _distro official repo: https://github.com/nir0s/distro
.. _distro issue tracker: https://github.com/nir0s/distro/issues
.. _open issues on missing test data: https://github.com/nir0s/distro/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22>
.. _distro official repo: https://github.com/python-distro/distro
.. _distro issue tracker: https://github.com/python-distro/distro/issues
.. _open issues on missing test data: https://github.com/python-distro/distro/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22>


**distro** package (Linux Distribution) version |version|
Expand All @@ -26,7 +26,7 @@ used by this package.
This package is tested on Python 2.7, 3.4+ and PyPy, with test data that
mimics the exact behavior of the data sources of
`a number of Linux distributions <https://github.com/nir0s/distro/tree/master/tests/resources/distros>`_.
`a number of Linux distributions <https://github.com/python-distro/distro/tree/master/tests/resources/distros>`_.

If you want to add test data for more distributions, please
create an issue in the `distro issue tracker`_
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def read(*parts):
setup(
name='distro',
version=package_version,
url='https://github.com/nir0s/distro',
url='https://github.com/python-distro/distro',
author='Nir Cohen',
author_email='nir36g@gmail.com',
license='Apache License, Version 2.0',
Expand Down

0 comments on commit 18cb594

Please # to comment.