Skip to content

Commit 0a87476

Browse files
authored
Merge pull request #874 from vsbogd/fix-release-after-conan-upgrade
Downgrade urllib3 library to be compatible with cibuildwheel environment
2 parents 2ee05be + 44d562a commit 0a87476

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

docs/DEVELOPMENT.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,36 @@ Python packages are released using
77
it. Usually it means setup docker and install the package from PyPi (see [setup
88
instructions](https://cibuildwheel.pypa.io/en/stable/setup/#local)).
99

10-
There are additional preparations to be made before running it. First of all
11-
`libhyperonc` library should be built and installed in a build environment. By
12-
default library downloads and install version from the `main` branch of the
13-
`trueagi-io/hyperon-experimental` repository. If one need to use the custom
14-
branch then it is done by passing custom parameters to the
15-
`install-hyperonc.sh` script which is called using
10+
There are additional preparations to be made. First of all it is needed to
11+
allow building and installing `libhyperonc` library on a build environment.
12+
`cibuildwheel` uses isolated docker container for each kind of platform it
13+
supports. Only code of the Python package is copied into container
14+
automatically. Code of the `libhyperonc` library should be downloaded from
15+
outside. It means one need to have the code in some repo accessible from the
16+
container before starting release. The simplest way is to push the changes in
17+
your GitHub repo fork.
18+
19+
By default library downloads and installs version from the `main` branch of the
20+
`trueagi-io/hyperon-experimental` repository. Using a custom branch is done by
21+
passing custom parameters to the `install-hyperonc.sh` script through
1622
[CIBW_BEFORE_ALL](https://cibuildwheel.pypa.io/en/stable/options/#before-all)
1723
environment variable:
1824
```
1925
export CIBW_BEFORE_ALL='sh -c "./python/install-hyperonc.sh -u <git-repo-url> -r <git-branch>"'
2026
```
21-
2227
One should replace `<git-repo-url>` and `<git-branch>` by the repo URL and
23-
branch which are used in release. It is required because `cibuildwheel` uses
24-
isolated docker container for each kind of platform it supports. Only code of
25-
the Python package is copied into container automatically. Code of the
26-
`libhyperonc` library should be downloaded from outside. It means one need to
27-
have the code in some repo accessible from the container before starting
28-
release. The simplest way is to push the changes in your GitHub repo fork.
29-
30-
Also one can start from building the only platform to quickly check whether
31-
release works. This can be done using
28+
branch which are used in release.
29+
30+
Also it is possible to start from building the only platform to quickly check
31+
whether release works. This can be done using
3232
[CIBW_BUILD](https://cibuildwheel.pypa.io/en/stable/options/#build-skip)
3333
variable:
3434
```
3535
export CIBW_BUILD=cp37-manylinux_x86_64
3636
```
3737

3838
After exporting the variables above one can start release by executing
39-
`cibuildwheel` from the `./python` directory of the repo. See [cibuildwheel
39+
`cibuildwheel ./python` from the root directory of the repo. See [cibuildwheel
4040
documentation](https://cibuildwheel.pypa.io/en/stable/) for details.
4141

4242
## How to update the version

python/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[build-system]
22
# setuptools >68.0.0 is incompatible with macos-13
33
# setuptools_scm >7.1.0 is incompatible with Python 3.7
4-
requires = ["setuptools==68.0.0", "conan==2.13.0", "cmake==3.24", "setuptools_scm[toml]==7.1.0"]
4+
# urllib3 >=2.0.0 is incompatible with OpenSSL <1.1.1+ which is used by cp37-manylinux_x86_64 wheel
5+
requires = ["setuptools==68.0.0", "conan==2.13.0", "urllib3==1.26.20", "cmake==3.24", "setuptools_scm[toml]==7.1.0"]
56
build-backend = "setuptools.build_meta"
67

78
[project]

0 commit comments

Comments
 (0)