kopia lustrzana https://github.com/jedie/PyInventory
Update README: "master" -> "main"
rodzic
9ba7613967
commit
ced23941d0
|
@ -5,8 +5,8 @@ Store information in WYSIWYG-HTML-Editor field and tag them and add Files, Image
|
||||||
|
|
||||||
Pull requests welcome!
|
Pull requests welcome!
|
||||||
|
|
||||||
| {{https://github.com/jedie/PyInventory/workflows/test/badge.svg?branch=master|Build Status on github}} | [[https://github.com/jedie/PyInventory/actions|github.com/jedie/PyInventory/actions]] |
|
| {{https://github.com/jedie/PyInventory/workflows/test/badge.svg?branch=main|Build Status on github}} | [[https://github.com/jedie/PyInventory/actions|github.com/jedie/PyInventory/actions]] |
|
||||||
| {{https://codecov.io/gh/jedie/PyInventory/branch/master/graph/badge.svg|Coverage Status on codecov.io}} | [[https://codecov.io/gh/jedie/PyInventory|codecov.io/gh/jedie/PyInventory]] |
|
| {{https://codecov.io/gh/jedie/PyInventory/branch/main/graph/badge.svg|Coverage Status on codecov.io}} | [[https://codecov.io/gh/jedie/PyInventory|codecov.io/gh/jedie/PyInventory]] |
|
||||||
|
|
||||||
[[https://install-app.yunohost.org/?app=pyinventory|Install PyInventory with YunoHost]].
|
[[https://install-app.yunohost.org/?app=pyinventory|Install PyInventory with YunoHost]].
|
||||||
If you don't have YunoHost, please consult [[https://yunohost.org/#/install|the guide]] to learn how to install it.
|
If you don't have YunoHost, please consult [[https://yunohost.org/#/install|the guide]] to learn how to install it.
|
||||||
|
@ -47,8 +47,8 @@ any many more... ;)
|
||||||
There are two main directories:
|
There are two main directories:
|
||||||
|
|
||||||
|= directory |= description
|
|= directory |= description
|
||||||
| **[[https://github.com/jedie/PyInventory/tree/master/src|/src/]]** | The main PyInventory source code
|
| **[[https://github.com/jedie/PyInventory/tree/main/src|/src/]]** | The main PyInventory source code
|
||||||
| **[[https://github.com/jedie/PyInventory/tree/master/deployment|/deployment/]]** | deploy PyInventory for production use case (**[[https://github.com/jedie/PyInventory/issues/81|DEPRECATED!]]**)
|
| **[[https://github.com/jedie/PyInventory/tree/main/deployment|/deployment/]]** | deploy PyInventory for production use case (**[[https://github.com/jedie/PyInventory/issues/81|DEPRECATED!]]**)
|
||||||
|
|
||||||
== install
|
== install
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ There exists these kind of installation/usage:
|
||||||
|
|
||||||
This README contains only the information about local development installation.
|
This README contains only the information about local development installation.
|
||||||
|
|
||||||
Read [[https://github.com/jedie/PyInventory/tree/master/deployment#readme|/deployment/README]] for instruction to install PyInventory on a root server.
|
Read [[https://github.com/jedie/PyInventory/tree/main/deployment#readme|/deployment/README]] for instruction to install PyInventory on a root server.
|
||||||
|
|
||||||
|
|
||||||
=== local development installation
|
=== local development installation
|
||||||
|
@ -168,13 +168,15 @@ Now, update the containers and copy the files back.
|
||||||
|
|
||||||
=== v0.5.0
|
=== v0.5.0
|
||||||
|
|
||||||
Git branches "master" and "deployment" was merged into one.
|
Git branches "main" and "deployment" was merged into one.
|
||||||
Files are separated into: "/src/" and "/development/"
|
Files are separated into: "/src/" and "/development/"
|
||||||
|
|
||||||
|
|
||||||
== history
|
== history
|
||||||
|
|
||||||
* [[https://github.com/jedie/PyInventory/compare/v0.13.0...master|compare v0.13.0...master]] **dev**
|
* [[https://github.com/jedie/PyInventory/compare/v0.13.0...main|compare v0.13.0...main]] **dev**
|
||||||
|
** Rename git "master" branch into "main"
|
||||||
|
** Use darker and pytest-darker as code formatter
|
||||||
** tbc
|
** tbc
|
||||||
* [[https://github.com/jedie/PyInventory/compare/v0.12.0...v0.13.0|v0.13.0 - 01.01.2022]]
|
* [[https://github.com/jedie/PyInventory/compare/v0.12.0...v0.13.0|v0.13.0 - 01.01.2022]]
|
||||||
** [[https://github.com/jedie/PyInventory/pull/83|Update requirements, e.g.: Django v3.2]]
|
** [[https://github.com/jedie/PyInventory/pull/83|Update requirements, e.g.: Django v3.2]]
|
||||||
|
|
20
README.rst
20
README.rst
|
@ -13,9 +13,9 @@ Pull requests welcome!
|
||||||
| |Coverage Status on codecov.io| | `codecov.io/gh/jedie/PyInventory`_ |
|
| |Coverage Status on codecov.io| | `codecov.io/gh/jedie/PyInventory`_ |
|
||||||
+---------------------------------+-----------------------------------------+
|
+---------------------------------+-----------------------------------------+
|
||||||
|
|
||||||
.. |Build Status on github| image:: https://github.com/jedie/PyInventory/workflows/test/badge.svg?branch=master
|
.. |Build Status on github| image:: https://github.com/jedie/PyInventory/workflows/test/badge.svg?branch=main
|
||||||
.. _github.com/jedie/PyInventory/actions: https://github.com/jedie/PyInventory/actions
|
.. _github.com/jedie/PyInventory/actions: https://github.com/jedie/PyInventory/actions
|
||||||
.. |Coverage Status on codecov.io| image:: https://codecov.io/gh/jedie/PyInventory/branch/master/graph/badge.svg
|
.. |Coverage Status on codecov.io| image:: https://codecov.io/gh/jedie/PyInventory/branch/main/graph/badge.svg
|
||||||
.. _codecov.io/gh/jedie/PyInventory: https://codecov.io/gh/jedie/PyInventory
|
.. _codecov.io/gh/jedie/PyInventory: https://codecov.io/gh/jedie/PyInventory
|
||||||
|
|
||||||
`Install PyInventory with YunoHost <https://install-app.yunohost.org/?app=pyinventory>`_.
|
`Install PyInventory with YunoHost <https://install-app.yunohost.org/?app=pyinventory>`_.
|
||||||
|
@ -83,8 +83,8 @@ There are two main directories:
|
||||||
| **`/deployment/`_** | deploy PyInventory for production use case (**`DEPRECATED!`_**) |
|
| **`/deployment/`_** | deploy PyInventory for production use case (**`DEPRECATED!`_**) |
|
||||||
+---------------------+-----------------------------------------------------------------+
|
+---------------------+-----------------------------------------------------------------+
|
||||||
|
|
||||||
.. _/src/: https://github.com/jedie/PyInventory/tree/master/src
|
.. _/src/: https://github.com/jedie/PyInventory/tree/main/src
|
||||||
.. _/deployment/: https://github.com/jedie/PyInventory/tree/master/deployment
|
.. _/deployment/: https://github.com/jedie/PyInventory/tree/main/deployment
|
||||||
.. _DEPRECATED!: https://github.com/jedie/PyInventory/issues/81
|
.. _DEPRECATED!: https://github.com/jedie/PyInventory/issues/81
|
||||||
|
|
||||||
-------
|
-------
|
||||||
|
@ -101,7 +101,7 @@ There exists these kind of installation/usage:
|
||||||
|
|
||||||
This README contains only the information about local development installation.
|
This README contains only the information about local development installation.
|
||||||
|
|
||||||
Read `/deployment/README <https://github.com/jedie/PyInventory/tree/master/deployment#readme>`_ for instruction to install PyInventory on a root server.
|
Read `/deployment/README <https://github.com/jedie/PyInventory/tree/main/deployment#readme>`_ for instruction to install PyInventory on a root server.
|
||||||
|
|
||||||
local development installation
|
local development installation
|
||||||
==============================
|
==============================
|
||||||
|
@ -234,14 +234,18 @@ Now, update the containers and copy the files back.
|
||||||
v0.5.0
|
v0.5.0
|
||||||
======
|
======
|
||||||
|
|
||||||
Git branches "master" and "deployment" was merged into one.
|
Git branches "main" and "deployment" was merged into one.
|
||||||
Files are separated into: "/src/" and "/development/"
|
Files are separated into: "/src/" and "/development/"
|
||||||
|
|
||||||
-------
|
-------
|
||||||
history
|
history
|
||||||
-------
|
-------
|
||||||
|
|
||||||
* `compare v0.13.0...master <https://github.com/jedie/PyInventory/compare/v0.13.0...master>`_ **dev**
|
* `compare v0.13.0...main <https://github.com/jedie/PyInventory/compare/v0.13.0...main>`_ **dev**
|
||||||
|
|
||||||
|
* Rename git "master" branch into "main"
|
||||||
|
|
||||||
|
* Use darker and pytest-darker as code formatter
|
||||||
|
|
||||||
* tbc
|
* tbc
|
||||||
|
|
||||||
|
@ -450,4 +454,4 @@ donation
|
||||||
|
|
||||||
------------
|
------------
|
||||||
|
|
||||||
``Note: this file is generated from README.creole 2022-01-01 14:21:31 with "python-creole"``
|
``Note: this file is generated from README.creole 2022-01-30 15:15:53 with "python-creole"``
|
Ładowanie…
Reference in New Issue