DavHau
b707c72fff
Merge pull request #394 from DavHau/fix-dependency-removal
...
Fix unwanted dependency removal; update nixpkgs + deps-db
2022-02-04 10:40:47 +07:00
DavHau
bb0b041c38
fix typo in comment
2022-02-04 10:25:07 +07:00
DavHau
8ea48a742b
only execute pre-commit hook on master
2022-02-04 10:01:52 +07:00
DavHau
d6f111c30e
Merge pull request #393 from DavHau/macos-arm64
...
fix: wheel selection for macos arm64
2022-02-04 09:30:01 +07:00
DavHau
2659c50bce
fix: wheel selection for macos arm64
2022-02-04 09:24:57 +07:00
DavHau
0078acd709
update conda-channels
2022-02-04 01:16:25 +07:00
DavHau
6a44e84351
fix bug in lib.nix
2022-02-04 01:16:10 +07:00
DavHau
c7da997337
fix bug in deptree.py
2022-02-04 01:15:59 +07:00
DavHau
30f6c6b2d8
update nixpkgs, python, pypi-deps-db
2022-02-03 23:02:45 +07:00
DavHau
c25116245d
improve unwanted dependency removal
...
- retrieve dependency information for nixpkgs packages only from sdist and not from wheel provider
- skip dependency removal if package dependencies are unknown
2022-02-03 22:11:44 +07:00
DavHau
655f0360ce
fix: wheel selection for macos arm64
2022-02-03 13:33:05 +07:00
DavHau
b492af0b10
Merge pull request #390 from joshbode/joshbode/python3-fix
...
use pkgs.python3 instead of pkgs.python(2)
2022-02-03 09:53:27 +07:00
Josh Bode
fbb6c3b932
use pkgs.python3 instead of pkgs.python(2)
2022-02-03 08:04:22 +11:00
DavHau
2d1360e4e2
Merge pull request #386 from tp-la/extra-pkg-dependencies
...
Update dependencies of python packages specified in packagesExtra in mkPython.
2022-02-02 15:13:18 +07:00
DavHau
7f1372dae7
update pypi-deps-db & fix test
2022-01-29 12:31:13 +07:00
DavHau
5cb044477e
Merge pull request #387 from DavHau/macos-arm64
...
Macos arm64
2022-01-28 13:34:23 +07:00
DavHau
94a36bee39
Merge pull request #363 from tp-la/extraneous-dep
...
Remove the dependency on python pkgconfig package in the dependency extractor.
2022-01-28 13:08:27 +07:00
DavHau
2e63cb554a
fix macos arm64 wheel selection
...
closes #350
2022-01-28 12:39:42 +07:00
DavHau
7c05e2bc5b
Merge branch 'pr-350' into macos-arm64
2022-01-28 12:32:43 +07:00
DavHau
cfe9e6e642
Merge pull request #359 from DavHau/fix-package-with-dot
...
fix handling package with dot in name
2022-01-28 12:12:05 +07:00
Tom Prince
f101dc4c27
Update dependencies of python packages specified in packagesExtra in mkPython.
...
Otherwise, it is likely that there will be collisions building the python environment,
as the dependencies of packages in packagesExtra won't match with the dependencies
calculated by mach-nix.
As a side-effect, this also causes the dependencies of mach-nix built packages included
by the `nixpkgs` provider to be included in dependency resolution.
2022-01-27 15:42:42 -07:00
Tom Prince
ac3e70ea68
Pass name ane version explicitly, rather than as a string, for nixpkgs python package versions.
...
This changes the internal format used to pass version information for nix to
python to not require parsing strings. This new format also makes it easier
to pass additional information (such as requirements, when available).
2022-01-27 15:41:38 -07:00
DavHau
bdc97ba6b2
Merge pull request #373 from vincentbernat/doc/flake
...
Add an example using a Flake
2022-01-04 21:31:05 +01:00
Vincent Bernat
83225b5eef
Add an example using a Flake
2022-01-02 16:21:57 +01:00
Tom Prince
7e2dddd8e7
Remove the dependency on python pkgconfig package in the dependency extractor.
...
This causes dependency extraction to fail on python2, with nixos-21.11.
2021-12-02 12:53:56 -07:00
DavHau
cecf873f6f
fix handling package with dot in name
2021-11-25 13:15:14 +07:00
DavHau
31b21203a1
Merge pull request #358 from DavHau/update-distlib
...
update distlib to 0.3.3
2021-11-24 00:07:23 +07:00
DavHau
58f99ca152
update distlib to 0.3.3
...
fixes #287
fixes #349
2021-11-23 23:13:03 +07:00
DavHau
4505205103
Merge pull request #354 from PrivateStorageio/352.direct-references
...
Ignore direct references in requirements
2021-11-18 14:14:08 +07:00
DavHau
50367a977b
Merge pull request #353 from exarkun/patch-1
...
remove the outdated count of supported providers
2021-11-12 22:51:35 +07:00
Jean-Paul Calderone
4d2cc6c6fe
try just ignoring direct references
2021-11-12 09:16:07 -05:00
Jean-Paul Calderone
4bbf08f236
remove the outdated count of supported providers
...
The providers are numbered. It probably doesn't help much to announce the total at the top.
2021-11-12 08:24:41 -05:00
Nasy
ea16287734
Match macosx_11_0_arm64.wheel
...
e.g. `numpy-1.21.4-cp310-cp310-macosx_11_0_arm64.whl` https://pypi.org/project/numpy/#files
2021-11-08 14:18:32 -06:00
DavHau
98d0017275
Merge pull request #348 from TyberiusPrime/master
...
correctly parse requirements that end in a stray comma
2021-10-27 22:28:59 +07:00
Florian Finkernagel
2d1efda0b6
correctly parse requirements that end in a stray comma
2021-10-27 11:03:18 +02:00
DavHau
dc94135e31
Merge pull request #347 from tp-la/accidentally-quadratic
...
Don't recursively update python dependencies when building package overrides.
2021-10-27 10:44:46 +07:00
Tom Prince
19f2abee71
Don't recursively update python dependencies when building package overrides.
...
Given that we update the dependencies of all the packages we add to the
override, and remove any dependencies of those packages that we don't override,
there is no need to recursivly update the dependencies, since the dependcies we
are adding have already had their dependencies updated.
2021-10-26 19:06:20 -06:00
DavHau
9d4599fa1c
Merge pull request #338 from tp-la/pep440-prereleases
...
Implement PEP440-compatible prerelease handling.
2021-10-25 15:34:19 +07:00
DavHau
be40cd0739
Merge pull request #335 from tp-la/mkpython-postbuild
...
Allow passing postBuild to mkPython.
2021-10-25 14:51:34 +07:00
DavHau
94226a896a
Merge pull request #341 from jared-w/master
...
Fix conda failures, test suite, and mkDockerImage, on macOS
2021-10-25 14:49:38 +07:00
jared-w
10bdb376f6
Don't hardcode nix flake tests to be x86_64-linux
2021-10-20 13:22:09 -07:00
jared-w
6f06aa09cd
Don't use busybox on macOS
2021-10-20 13:21:11 -07:00
jared-w
053e193914
Silence 'missing git' warning on macOS
2021-10-20 13:14:55 -07:00
jared-w
f5c482267c
Fix providers.py on macOS
2021-10-20 11:10:56 -07:00
DavHau
4433f74a97
expose mkPy of lib/extractor/default.nix
2021-10-20 13:24:05 +07:00
DavHau
b56a541af1
chore: remove debugging leftovers
2021-10-15 14:09:58 +07:00
DavHau
357a7d07c4
Merge pull request #337 from tp-la/sdist-python-requires
...
Handle `python_requires` for sdist provider.
2021-10-15 14:02:35 +07:00
DavHau
7306ea200a
Merge pull request #336 from tp-la/version-match
...
Handle more case of nixpkgs version matching.
2021-10-15 13:43:06 +07:00
DavHau
50f3debe19
Merge pull request #333 from tp-la/fix-307
...
Use flake.lock in python package from nix.
2021-10-15 11:41:28 +07:00
Tom Prince
b48e38d5dd
Remove unused conda dependency.
2021-10-12 13:29:03 -06:00