Skip to content

Commit 243f7cb

Browse files
committed
Refactor and streamline thirdparty utilities
There is now a single primary script "fetch_thirdparty.py" that handles everything in a simplified way. There is no utility to build wheels anymore: these MUST be available before hand on PyPI or built manually and uploaded in our self-hosted PyPI repository. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent e810da3 commit 243f7cb

12 files changed

+1233
-2529
lines changed

etc/scripts/README.rst

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Pre-requisites
1515

1616
* To generate or update pip requirement files, you need to start with a clean
1717
virtualenv as instructed below (This is to avoid injecting requirements
18-
specific to the tools here in the main requirements).
18+
specific to the tools used here in the main requirements).
1919

2020
* For other usages, the tools here can run either in their own isolated
21-
virtualenv best or in the the main configured development virtualenv.
21+
virtualenv or in the the main configured development virtualenv.
2222
These requireements need to be installed::
2323

2424
pip install --requirement etc/release/requirements.txt
@@ -82,45 +82,14 @@ Populate a thirdparty directory with wheels, sources, .ABOUT and license files
8282
Scripts
8383
~~~~~~~
8484

85-
* **fetch_requirements.py** will fetch package wheels, their ABOUT, LICENSE and
86-
NOTICE files to populate a local a thirdparty directory strictly from our
87-
remote repo and using only pinned packages listed in one or more pip
88-
requirements file(s). Fetch only requirements for specific python versions and
89-
operating systems. Optionally fetch the corresponding source distributions.
90-
91-
* **publish_files.py** will upload/sync a thirdparty directory of files to our
92-
remote repo. Requires a GitHub personal access token.
93-
94-
* **build_wheels.py** will build a package binary wheel for multiple OS and
95-
python versions. Optionally wheels that contain native code are built
96-
remotely. Dependent wheels are optionally included. Requires Azure credentials
97-
and tokens if building wheels remotely on multiple operatin systems.
98-
99-
* **fix_thirdparty.py** will fix a thirdparty directory with a best effort to
100-
add missing wheels, sources archives, create or fetch or fix .ABOUT, .NOTICE
101-
and .LICENSE files. Requires Azure credentials and tokens if requesting the
102-
build of missing wheels remotely on multiple operatin systems.
85+
* **fetch_thirdparty.py** will fetch package wheels, source sdist tarballs
86+
and their ABOUT, LICENSE and NOTICE files to populate a local directory from
87+
a list of PyPI simple URLs (typically PyPI.org proper and our self-hosted PyPI)
88+
using pip requirements file(s), specifiers or pre-existing packages files.
89+
Fetch wheels for specific python version and operating system combinations.
10390

10491
* **check_thirdparty.py** will check a thirdparty directory for errors.
10592

106-
* **bootstrap.py** will bootstrap a thirdparty directory from a requirements
107-
file(s) to add or build missing wheels, sources archives and create .ABOUT,
108-
.NOTICE and .LICENSE files. Requires Azure credentials and tokens if
109-
requesting the build of missing wheels remotely on multiple operatin systems.
110-
111-
112-
113-
Usage
114-
~~~~~
115-
116-
See each command line --help option for details.
117-
118-
* (TODO) **add_package.py** will add or update a Python package including wheels,
119-
sources and ABOUT files and this for multiple Python version and OSes(for use
120-
with upload_packages.py afterwards) You will need an Azure personal access
121-
token for buidling binaries and an optional DejaCode API key to post and fetch
122-
new package versions there. TODO: explain how we use romp
123-
12493

12594
Upgrade virtualenv app
12695
----------------------

etc/scripts/bootstrap.py

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

0 commit comments

Comments
 (0)