Skip to content

Commit e9f03ae

Browse files
committed
docs: Remove .py suffix from tool names
1 parent 635cde1 commit e9f03ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+330
-319
lines changed

.github/ISSUE_TEMPLATE/bug-report-no-hw.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
id: version
1515
attributes:
1616
label: Esptool Version
17-
description: The output of `git describe` if working with the sources, output of `esptool.py version` otherwise. If possible, consider [updating esptool](https://docs.espressif.com/projects/esptool/en/latest/installation.html#how-to-update).
17+
description: The output of `git describe` if working with the sources, output of `esptool version` otherwise. If possible, consider [updating esptool](https://docs.espressif.com/projects/esptool/en/latest/installation.html#how-to-update).
1818
placeholder: ex. v4.0.1, commit v4.1-10-g2059335aa
1919
validations:
2020
required: true
@@ -31,7 +31,7 @@ body:
3131
attributes:
3232
label: Full Esptool Command Line that Was Run
3333
description: Please input the full esptool command.
34-
placeholder: ex. `esptool.py elf2image esp32-bootloader.elf`
34+
placeholder: ex. `esptool elf2image esp32-bootloader.elf`
3535
- type: textarea
3636
id: output
3737
attributes:

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ blank_issues_enabled: false
22
contact_links:
33
- name: ESP8266 Forum
44
url: https://bbs.espressif.com/
5-
about: For questions about using esptool.py with ESP8266
5+
about: For questions about using esptool with ESP8266
66
- name: ESP32 Forum
77
url: https://esp32.com
8-
about: For questions about using esptool.py with ESP32
9-
8+
about: For questions about using esptool with ESP32

.github/ISSUE_TEMPLATE/issue-with-hw.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ body:
2121
id: version
2222
attributes:
2323
label: Esptool Version
24-
description: The output of `git describe` if working with the sources, output of `esptool.py version` otherwise. If possible, consider [updating esptool](https://docs.espressif.com/projects/esptool/en/latest/installation.html#how-to-update).
24+
description: The output of `git describe` if working with the sources, output of `esptool version` otherwise. If possible, consider [updating esptool](https://docs.espressif.com/projects/esptool/en/latest/installation.html#how-to-update).
2525
placeholder: ex. v4.0.1, commit v4.1-10-g2059335aa
2626
validations:
2727
required: true
@@ -66,7 +66,7 @@ body:
6666
attributes:
6767
label: Full Esptool Command Line that Was Run
6868
description: Please input the full esptool command.
69-
placeholder: ex. `esptool.py -p COM3 write-flash 0x0 bootloader.bin`
69+
placeholder: ex. `esptool -p COM3 write-flash 0x0 bootloader.bin`
7070
- type: textarea
7171
id: output
7272
attributes:

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Please include the issue URL or the # issue number here. -->
1212
1313
If you did not perform any testing, write "NO TESTING" in this section. -->
1414

15-
# I have run the esptool.py automated integration tests with this change and the above hardware:
16-
<!-- In this section, post the results of running the automatic integration tests of esptool.py with this change and the above hardware.
15+
# I have run the esptool automated integration tests with this change and the above hardware:
16+
<!-- In this section, post the results of running the automatic integration tests of esptool with this change and the above hardware.
1717
1818
Details here: https://docs.espressif.com/projects/esptool/en/latest/contributing.html#automated-integration-tests
1919

.github/workflows/test_esptool.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ jobs:
4040
esptool.py --help
4141
espefuse.py --help
4242
espsecure.py --help
43+
esp_rfc2217_server.py --help
44+
esptool --help
45+
espefuse --help
46+
espsecure --help
47+
esp_rfc2217_server --help
4348
4449
- name: Test esptool and components
4550
run: |

.gitlab-ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ version_check:
5151
rules:
5252
- if: '$CI_COMMIT_TAG != null'
5353
script:
54-
- VERSION=$(esptool.py version | head -n 1)
54+
- VERSION=$(esptool version | head -n 1)
5555
- |
5656
if [[ "$VERSION" != *"$CI_COMMIT_TAG" ]]
5757
then
@@ -171,6 +171,11 @@ run_pre_commit_hooks:
171171
esptool.py --help
172172
espefuse.py --help
173173
espsecure.py --help
174+
esp_rfc2217_server.py --help
175+
esptool --help
176+
espefuse --help
177+
espsecure --help
178+
esp_rfc2217_server --help
174179
python esptool.py --help
175180
python espefuse.py --help
176181
python espsecure.py --help

CONTRIBUTING.rst

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
Contributions Guide
22
===================
33

4-
We welcome contributions to the ``esptool.py`` project!
4+
We welcome contributions to the ``esptool`` project!
55

66
How to Contribute
77
-----------------
88

9-
Contributions to ``esptool.py`` - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests>`_.
9+
Contributions to ``esptool`` - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests>`_.
1010

1111
.. _development-setup:
1212

1313
Development Setup
1414
-----------------
1515

16-
Development mode allows you to run the latest development version from the `esptool.py repository on GitHub <https://github.com/espressif/esptool>`_.
16+
Development mode allows you to run the latest development version from the `esptool repository on GitHub <https://github.com/espressif/esptool>`_.
1717

1818
.. code-block:: sh
1919
2020
$ git clone https://github.com/espressif/esptool.git
2121
$ cd esptool
2222
$ pip install --user -e .
2323
24-
This will install ``esptool.py``’s dependencies and create some executable script wrappers in the users ``bin`` directory. The wrappers will run the scripts found in the git working directory directly, so any time the working directory contents change it will pick up the new versions.
24+
This will install ``esptool``'s dependencies and create some executable script wrappers in the user's ``bin`` directory. The wrappers will run the scripts found in the git working directory directly, so any time the working directory contents change it will pick up the new versions.
2525

26-
Its also possible to run the scripts directly from the working directory with this Development Mode installation.
26+
It's also possible to run the scripts directly from the working directory with this Development Mode installation.
2727

28-
To also install additional tools needed for actually developing and testing ``esptool.py``, run this command to install a development copy of ``esptool.py`` *plus* packages useful for development:
28+
To also install additional tools needed for actually developing and testing ``esptool``, run this command to install a development copy of ``esptool`` *plus* packages useful for development:
2929

3030
::
3131

@@ -36,7 +36,7 @@ To also install additional tools needed for actually developing and testing ``es
3636
Reporting Issues
3737
----------------
3838

39-
Please report bugs in ``esptool.py`` if you find them. However, before reporting a bug please check through the following:
39+
Please report bugs in ``esptool`` if you find them. However, before reporting a bug please check through the following:
4040

4141
* `Troubleshooting Guide <https://docs.espressif.com/projects/esptool/en/latest/troubleshooting.html>`_ - common problems and known issues.
4242

@@ -58,7 +58,7 @@ Before Contributing
5858

5959
Before sending us a Pull Request, please consider this list of points:
6060

61-
* Have you tried running ``esptool.py`` test suite locally?
61+
* Have you tried running ``esptool`` test suite locally?
6262

6363
* Is the code adequately commented for people to understand how it is structured?
6464

@@ -73,7 +73,7 @@ Before sending us a Pull Request, please consider this list of points:
7373
Code Style & Static Analysis
7474
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7575

76-
Please follow these coding standards when writing code for ``esptool.py``:
76+
Please follow these coding standards when writing code for ``esptool``:
7777

7878
Pre-Commit Checks
7979
"""""""""""""""""
@@ -92,13 +92,13 @@ On the first commit ``pre-commit`` will install the hooks, subsequent checks wil
9292
Conventional Commits
9393
""""""""""""""""""""
9494

95-
``esptool.py`` complies with the `Conventional Commits standard <https://www.conventionalcommits.org/en/v1.0.0/#specification>`_. Every commit message is checked with `Conventional Precommit Linter <https://github.com/espressif/conventional-precommit-linter>`_, ensuring it adheres to the standard.
95+
``esptool`` complies with the `Conventional Commits standard <https://www.conventionalcommits.org/en/v1.0.0/#specification>`_. Every commit message is checked with `Conventional Precommit Linter <https://github.com/espressif/conventional-precommit-linter>`_, ensuring it adheres to the standard.
9696

9797

9898
Ruff
9999
""""
100100

101-
``esptool.py`` is `PEP8 <https://peps.python.org/pep-0008/>`_ compliant and enforces this style guide. For compliance checking, we use `ruff <https://docs.astral.sh/ruff/>`_.
101+
``esptool`` is `PEP8 <https://peps.python.org/pep-0008/>`_ compliant and enforces this style guide. For compliance checking, we use `ruff <https://docs.astral.sh/ruff/>`_.
102102
``Ruff`` also auto-format files in the same style as previously used ``black``.
103103

104104

@@ -122,22 +122,22 @@ In the event of false positives, you can adjust the configuration in the `.codes
122122
Automated Integration Tests
123123
^^^^^^^^^^^^^^^^^^^^^^^^^^^
124124

125-
The test directory contains a `pytest <https://docs.pytest.org/>`_ integration suite with some integration tests for ``esptool.py``, ``espefuse.py``, and ``espsecure.py``.
125+
The test directory contains a `pytest <https://docs.pytest.org/>`_ integration suite with some integration tests for ``esptool``, ``espefuse``, and ``espsecure``.
126126

127-
It is necessary to have ``esptool.py`` installed (see `Development Setup`_) in your environment in order to run these tests.
127+
It is necessary to have ``esptool`` installed (see `Development Setup`_) in your environment in order to run these tests.
128128

129129
The following tests run automatically by GitHub Actions for each Pull Request. You can run them locally to check for regressions in the respective functionality:
130130

131131
* ``test_imagegen.py`` tests the ``elf2image`` command
132132
* ``test_image_info.py`` tests the ``image-info`` command
133133
* ``test_mergebin.py`` tests the ``merge-bin`` command
134-
* ``test_modules.py`` tests the modules used by ``esptool.py`` for regressions
135-
* ``test_espsecure.py`` tests ``espsecure.py`` functionality
136-
* ``test_espsecure_hsm.py`` tests support of external HSM signing in ``espsecure.py``. These tests require additional prerequisites, see ``SoftHSM2 setup`` in the `tests workflow definition <https://github.com/espressif/esptool/blob/master/.github/workflows/test_esptool.yml>`_ for more information.
134+
* ``test_modules.py`` tests the modules used by ``esptool`` for regressions
135+
* ``test_espsecure.py`` tests ``espsecure`` functionality
136+
* ``test_espsecure_hsm.py`` tests support of external HSM signing in ``espsecure``. These tests require additional prerequisites, see ``SoftHSM2 setup`` in the `tests workflow definition <https://github.com/espressif/esptool/blob/master/.github/workflows/test_esptool.yml>`_ for more information.
137137

138138
The following tests are not run automatically by GitHub Actions, because they need real connected hardware. Therefore, they need to be run locally in a command line:
139139

140-
* ``test_esptool.py`` contains integration tests for ``esptool.py`` and needs to be run against real Espressif hardware with the following format:
140+
* ``test_esptool.py`` contains integration tests for ``esptool`` and needs to be run against real Espressif hardware with the following format:
141141

142142
``pytest test_esptool.py --port <serial port> --chip <name of chip> --baud <baud rate>``
143143

@@ -153,15 +153,15 @@ The following tests are not run automatically by GitHub Actions, because they ne
153153

154154
Some tests might fail at higher baud rates on some hardware.
155155

156-
* ``test_esptool_sdm.py`` contains integration tests for ``esptool.py`` with chips in secure download mode. It needs to be run against real Espressif hardware (with active SDM). The command line format is the same as for ``test_esptool.py``.
156+
* ``test_esptool_sdm.py`` contains integration tests for ``esptool`` with chips in secure download mode. It needs to be run against real Espressif hardware (with active SDM). The command line format is the same as for ``test_esptool.py``.
157157

158158
The following tests are not run automatically by GitHub Actions, but can be run locally in a command line:
159159

160-
* ``test_espefuse.py`` tests ``espefuse.py`` functionality. To run it:
160+
* ``test_espefuse.py`` tests ``espefuse`` functionality. To run it:
161161

162162
``pytest test_espefuse.py --chip <name of chip>``
163163

164-
These test use the ``--virt`` virtual mode of ``espefuse.py`` to safely test the functionality without a connection to a chip and without the possibility of affecting the actual eFuses in a real hardware.
164+
These test use the ``--virt`` virtual mode of ``espefuse`` to safely test the functionality without a connection to a chip and without the possibility of affecting the actual eFuses in a real hardware.
165165

166166
.. warning::
167167

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include LICENSE
33
include esptool/targets/stub_flasher/1/*
44
include esptool/targets/stub_flasher/2/*
55
include espefuse/efuse_defs/*.yaml
6-
# sdist includes test/test*.py by default, but esptool.py tests
6+
# sdist includes test/test*.py by default, but esptool tests
77
# are so far only intended to run from the git repo itself
88
prune test
99
prune .github

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# esptool.py
1+
# esptool
22

33
A Python-based, open-source, platform-independent serial utility for flashing, provisioning, and interacting with Espressif SoCs.
44

55
[![Test esptool](https://github.com/espressif/esptool/actions/workflows/test_esptool.yml/badge.svg?branch=master)](https://github.com/espressif/esptool/actions/workflows/test_esptool.yml) [![Build esptool](https://github.com/espressif/esptool/actions/workflows/build_esptool.yml/badge.svg?branch=master)](https://github.com/espressif/esptool/actions/workflows/build_esptool.yml)
66

77
## Documentation
88

9-
Visit the [documentation](https://docs.espressif.com/projects/esptool/) or run `esptool.py -h`.
9+
Visit the [documentation](https://docs.espressif.com/projects/esptool/) or run `esptool -h`.
1010

1111
## Contribute
1212

13-
If you're interested in contributing to esptool.py, please check the [contributions guide](https://docs.espressif.com/projects/esptool/en/latest/contributing.html).
13+
If you're interested in contributing to esptool, please check the [contributions guide](https://docs.espressif.com/projects/esptool/en/latest/contributing.html).
1414

1515
## About
1616

17-
esptool.py was initially created by Fredrik Ahlberg (@[themadinventor](https://github.com/themadinventor/)), and later maintained by Angus Gratton (@[projectgus](https://github.com/projectgus/)). It is now supported by Espressif Systems. It has also received improvements from many members of the community.
17+
esptool was initially created by Fredrik Ahlberg (@[themadinventor](https://github.com/themadinventor/)), and later maintained by Angus Gratton (@[projectgus](https://github.com/projectgus/)). It is now supported by Espressif Systems. It has also received improvements from many members of the community.
1818

1919
## License
2020

0 commit comments

Comments
 (0)