Skip to content

Commit

Permalink
PyPi trusted publishers
Browse files Browse the repository at this point in the history
Names updated
  • Loading branch information
strokovnjaka committed Feb 7, 2024
1 parent 5bec0b0 commit c0c0f5c
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 18 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# For more information see:
# - https://packaging.python.org/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/
# - https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
# - https://docs.pypi.org/trusted-publishers/using-a-publisher/

name: Upload Python Package

Expand Down Expand Up @@ -42,6 +43,8 @@ jobs:
if: github.event_name == 'push'
needs: [build]
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- name: Download dist files
uses: actions/download-artifact@v2
Expand All @@ -52,8 +55,6 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
repository_url: https://test.pypi.org/legacy/
user: __token__
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
publish:
name: Publish to PyPI
if: github.event_name == 'release'
Expand All @@ -67,6 +68,3 @@ jobs:
path: dist/
- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ paolo-losi <https://github.com/paolo-losi>
yuriykashin <https://github.com/yuriykashin>
foXes68 <https://github.com/foXes68>
babca <https://github.com/babca>

strokovnjaka <https://github.com/strokovnjaka>
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
* Wed Feb 9 2024 strokovnjaka - 0.14
- stable release
- fixed single-parameter-only CMGD command modems
- using trusted publishers instead of token auth for PyPi

* Wed Mar 15 2017 babca - 0.12
– stable release
- unit tests fixed after rapid merging – credits to: tomchy
Expand Down
20 changes: 10 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
python-gsmmodem-new
python-gsmmodem-stk
===================
*GSM modem module for Python*

Expand Down Expand Up @@ -44,44 +44,44 @@ Requirements
How to install this package
---------------------------

There are multiple ways to install ``python-gsmmodem-new`` package:
There are multiple ways to install ``python-gsmmodem-stk`` package:

Automatic installation of the latest "stable" release from PyPI
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

::

pip install python-gsmmodem-new
pip install python-gsmmodem-stk

`pip <http://www.pip-installer.org>`_ will automatically download and install
all dependencies, as required. You can also utilise ``easy_install`` in the
same manner as using ``pip`` above.

If you are utilising ``python-gsmmodem-new`` as part of another project,
If you are utilising ``python-gsmmodem-stk`` as part of another project,
add it to your ``install_requires`` section of your ``setup.py`` file and
upon your project's installation, it will be pulled in automatically.

Manual installation of the latest "stable" release from PyPI
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Download a ``python-gsmmodem-new`` archive from `PyPI
<https://pypi.python.org/pypi/python-gsmmodem-new>`_, extract it and install the package with command::
Download a ``python-gsmmodem-stk`` archive from `PyPI
<https://pypi.python.org/pypi/python-gsmmodem-stk>`_, extract it and install the package with command::

python setup.py install

Note that ``python-gsmmodem-new`` package relies on ``pySerial`` for serial communications:
Note that ``python-gsmmodem-stk`` package relies on ``pySerial`` for serial communications:
https://github.com/pyserial/pyserial

Installation of the latest commit from GitHub
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Clone from GitHub::

git clone https://github.com/babca/python-gsmmodem.git
git clone https://github.com/strokovnjaka/python-gsmmodem.git
cd python-gsmmodem/
python setup.py install

Note that ``python-gsmmodem-new`` package relies on ``pySerial`` for serial communications:
Note that ``python-gsmmodem-stk`` package relies on ``pySerial`` for serial communications:
https://github.com/pyserial/pyserial

Testing the package
Expand Down Expand Up @@ -114,7 +114,7 @@ Building documentation
This package contains `Sphinx <http://sphinx-doc.org>`_-based documentation.
To manually build or test the documentation locally, do the following::

git clone https://github.com/babca/python-gsmmodem.git
git clone https://github.com/strokovnjaka/python-gsmmodem.git
cd python-gsmmodem
pip install .[doc]
cd doc
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[metadata]
name = python-gsmmodem-new
name = python-gsmmodem-stk
description = Control an attached GSM modem: send/receive SMS messages, handle calls, etc
license = LGPLv3+
author = Francois Aucamp
author_email = [email protected]
url = https://github.com/babca/python-gsmmodem
url = https://github.com/strokovnjaka/python-gsmmodem
long_description = file: README.rst
long_description_content_type = text/x-rst
classifiers =
Expand Down

0 comments on commit c0c0f5c

Please sign in to comment.