Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.

Commit b9464a9

Browse files
PaebbelsPaebbels
committed
Collection of updates.
1 parent 110ed92 commit b9464a9

7 files changed

Lines changed: 30 additions & 27 deletions

File tree

‎.github/workflows/Pipeline.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,10 @@ jobs:
232232
pip install -r build/requirements.package.txt
233233
234234
- name: 🔨 Build Python package (source distribution)
235-
run: |
236-
python setup.py sdist
235+
run: python setup.py sdist
237236

238237
- name: 🔨 Build Python package (binary distribution - wheel)
239-
run: |
240-
python setup.py bdist_wheel
238+
run: python setup.py bdist_wheel
241239

242240
- name: 📤 Upload 'pyTooling.TerminalUI' artifact
243241
uses: actions/upload-artifact@v2
@@ -280,12 +278,17 @@ jobs:
280278
python -m pip install --upgrade pip
281279
pip install -r build/requirements.publish.txt
282280
283-
- name: ⤴ Release Python package to PyPI
281+
- name: ⤴ Release Python package (sources) to PyPI
284282
env:
285283
TWINE_USERNAME: __token__
286284
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
287-
run: |
288-
twine upload dist/*
285+
run: twine upload dist/*.tar.gz
286+
287+
- name: ⤴ Release Python package (wheel) to PyPI
288+
env:
289+
TWINE_USERNAME: __token__
290+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
291+
run: twine upload dist/*.whl
289292

290293
- name: 🗑️ Delete packaging Artifacts
291294
uses: geekyeggo/delete-artifact@v1

‎build/requirements.package.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎build/requirements.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
pyTooling.Packaging>=0.3.0
2+
3+
wheel

build/requirements.publish.txt renamed to dist/requirements.txt

File renamed without changes.

‎doc/Dependencies.rst‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PyPI (see :ref:`installation`).
4040
+==========================================================+=============+===========================================================================================+=================================================================================================================================+
4141
| `colorama <https://GitHub.com/tartley/colorama>`__ | ≥0.4.4 | `BSD-3-Clause <https://GitHub.com/tartley/colorama/blob/master/LICENSE.txt>`__ | None |
4242
+----------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
43-
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥1.4.6 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.txt>`__ | *None* |
43+
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥1.5.1 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.txt>`__ | *None* |
4444
+----------------------------------------------------------+-------------+-------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
4545

4646

@@ -126,23 +126,23 @@ on a CI server, thus sub-dependencies are not evaluated further.
126126

127127
.. rubric:: Manually Installing Documentation Requirements
128128

129-
Use the :file:`build/requirements.package.txt` file to install all dependencies via ``pip3``. The file will recursively
129+
Use the :file:`build/requirements.txt` file to install all dependencies via ``pip3``. The file will recursively
130130
install the mandatory dependencies too.
131131

132132
.. code-block:: shell
133133
134-
pip3 install -U -r build/requirements.package.txt
134+
pip3 install -U -r build/requirements.txt
135135
136136
137137
.. rubric:: Dependency List
138138

139-
+----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+
140-
| **Package** | **Version** | **License** | **Dependencies** |
141-
+==========================================================+==============+===========================================================================================+======================+
142-
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥1.4.6 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.txt>`__ | *None* |
143-
+----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+
144-
| `wheel <https://GitHub.com/pypa/wheel>`__ | any | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__ | *Not yet evaluated.* |
145-
+----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+
139+
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
140+
| **Package** | **Version** | **License** | **Dependencies** |
141+
+============================================================================+==============+==========================================================================================================+======================================================================================================================================================+
142+
| `pyTooling.Packaging <https://GitHub.com/pyTooling/pyTooling.Packaging>`__ | ≥0.3.0 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling.Packaging/blob/main/LICENSE.md>`__ | * `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ (`Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.txt>`__) |
143+
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
144+
| `wheel <https://GitHub.com/pypa/wheel>`__ | any | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__ | *Not yet evaluated.* |
145+
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
146146

147147

148148
.. _dependency-publishing:
@@ -157,12 +157,12 @@ further.
157157

158158
.. rubric:: Manually Installing Documentation Requirements
159159

160-
Use the :file:`build/requirements.publish.txt` file to install all dependencies via ``pip3``. The file will recursively
160+
Use the :file:`dist/requirements.txt` file to install all dependencies via ``pip3``. The file will recursively
161161
install the mandatory dependencies too.
162162

163163
.. code-block:: shell
164164
165-
pip3 install -U -r build/requirements.publish.txt
165+
pip3 install -U -r dist/requirements.txt
166166
167167
168168
.. rubric:: Dependency List

‎doc/conf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@
231231
# Sphinx.Ext.ExtLinks
232232
# ==============================================================================
233233
extlinks = {
234-
'issue': ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/issues/%s', 'issue #'),
235-
'pull': ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/pull/%s', 'pull request #'),
236-
'src': ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/blob/main/pyTooling/%s?ts=2', None),
237-
# 'test': ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/blob/main/test/%s?ts=2', None)
234+
"ghissue": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/issues/%s', 'issue #'),
235+
"ghpull": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/pull/%s', 'pull request #'),
236+
"ghsrc": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/blob/main/pyTooling/%s?ts=2', None),
237+
# "ghtest": ('https://GitHub.com/pyTooling/pyTooling.TerminalUI/blob/main/test/%s?ts=2', None)
238238
}
239239

240240

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
colorama>=0.4.4
22

3-
pyTooling>=1.4.6
3+
pyTooling>=1.5.1

0 commit comments

Comments
 (0)