Skip to content

Commit

Permalink
Roll back all the editable install behaviour - it is not necessary ju…
Browse files Browse the repository at this point in the history
…st yet.
  • Loading branch information
pelson committed Feb 13, 2024
1 parent 3de98dc commit b9472a3
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .azure/scripts/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
displayName: 'Install requirements'

- script: |
pip install -e .[tests] --install-option="--enable-coverage" --install-option="--enable-build-jar"
python setup.py develop --enable-coverage --enable-build-jar
displayName: 'Build'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion .azure/scripts/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ steps:

- script: |
sudo apt install gdb
pip install ./ # --install-option="--enable-tracing"
pip install ./
displayName: 'Build module'

- script: python -c "import jpype"
Expand Down
2 changes: 1 addition & 1 deletion .azure/scripts/tracing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ steps:
inputs:
versionSpec: '3.8'
- script: |
pip install -e . --install-option="--enable-coverage" --install-option="--enable-build-jar"
python setup.py develop --enable-tracing --enable-build-jar
displayName: 'Build'

7 changes: 6 additions & 1 deletion doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ Latest Changes:
- Use PEP-518 and PEP-660 configuration for the package, allowing editable and
configurable builds using modern Python packaging tooling.
Where before ``python setup.py --enable-tracing develop``, now can be done with
``pip install --editable ./ --install-option="--enable-tracing"``.
``pip install --editable ./ --config-setting="--install-option=--enable-tracing"``.
The old setup.py usage remains, but is discouraged, and the arguments are now passed
after the command (previously they were specified before).

- Use PEP-518 configuration for the package, allowing
configurable builds using more up-to-date Python packaging tooling.
For editable installs, ``python setup.py --enable-tracing develop``
must now be done with ``python setup.py develop --enable-tracing``.

- **1.5.0 - 2023-04-03**

- Support for Python 3.12
Expand Down
4 changes: 2 additions & 2 deletions doc/develguide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ must be enabled with a compiler switch to activate. To active the logger, touch
one of the cpp files in the native directory to mark the build as dirty, then
compile the ``jpype`` module with: ::

pip install -e . --install-option="--enable-tracing"
python setup.py develop --enable-tracing

Once built run a short test program that demonstrates the problem and capture the
output of the terminal to a file. This should allow the developer to isolate
Expand All @@ -964,7 +964,7 @@ Coverage
Some of the tests require additional instrumentation to run, this can be enabled
with the ``enable-coverage`` option::

pip install -e . --install-option="--enable-coverage"
python setup.py develop --enable-coverage


Debugging issues
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"setuptools>=65.*", # For editable_wheel command.
"setuptools",
]
build-backend = "setuptools.build_meta"

Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@


setup(
# Non-standard, and extension behaviour. See also:
# Non-standard, and extension behaviour of setup() - project information
# should be put in pyproject.toml wherever possible. See also:
# https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html#setuptools-specific-configuration
platforms=[
'Operating System :: Microsoft :: Windows',
Expand All @@ -67,8 +68,6 @@
cmdclass={
'build_ext': setupext.build_ext.BuildExtCommand,
'develop': setupext.develop.Develop,
# The command for pip --editable.
'editable_wheel': setupext.editable_wheel.EditableWheel,
'test_java': setupext.test_java.TestJavaCommand,
'sdist': setupext.sdist.BuildSourceDistribution,
'test': setupext.pytester.PyTest,
Expand Down
1 change: 0 additions & 1 deletion setupext/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from . import platform
from . import build_ext
from . import develop
from . import editable_wheel
from . import test_java
from . import sdist
from . import pytester
42 changes: 0 additions & 42 deletions setupext/editable_wheel.py

This file was deleted.

0 comments on commit b9472a3

Please sign in to comment.