yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
399 commits 1 branch 0 tags 738 KiB
Commit graph

230 commits

Author SHA1 Message Date
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
jared-w
6f06aa09cd Don't use busybox on macOS 2021-10-20 13:21:11 -07:00
jared-w
f5c482267c Fix providers.py on macOS 2021-10-20 11:10:56 -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
Tom Prince
b48e38d5dd Remove unused conda dependency. 2021-10-12 13:29:03 -06:00
Tom Prince
338d99091b Switch PyVer to use packaging.version exclusively. 2021-10-12 14:26:52 -06:00
Tom Prince
624edfc3ea Add PEP440 prerelease version handling. 
This switches to using `packaging.version` for version numbers
and `packaging.specifiers` for handling specifiers, the later
which implements the PEP440 logic for prereleases.
 2021-10-12 13:06:03 -06:00
Tom Prince
2b87c68edb Add a special case for pytz>dev. 
This deals with the workaround described in https://github.com/pypa/pip/issues/974#issuecomment-22641489.
 2021-10-12 17:13:55 -06:00
Tom Prince
23a910dbc2 Require a separator when multiple specifiers are in a requirement. 2021-10-12 15:40:05 -06:00
Tom Prince
cf421d4716 Try parsing pypi requirements with packaging in tests. 
If `packaging` can't parse a specifier without using a legacy specifier, then
we shouldn't worry about failing to parse it ourselves.
 2021-10-12 16:33:33 -06:00
Tom Prince
7aad9f0f9d Delete some dead code. 2021-10-12 12:12:49 -06:00
Tom Prince
fdf572db07 Handle arbitrary length version. 2021-10-12 11:22:21 -06:00
Tom Prince
8a70284c08 Handle multiple nixpkg matching versions arbitrarily. 2021-10-12 11:22:18 -06:00
Tom Prince
9b71888ed4 Allow passing postBuild to mkPython. 
Fixes #323.
 2021-10-11 21:44:32 -06:00
Tom Prince
9163528467 Handle python_requires for sdist provider. 2021-10-11 18:51:16 -06:00
Tom Prince
7e3683f7d1 Use flake.lock in python package from nix. 
Fixes #307.
 2021-10-11 13:52:06 -06:00
Bjørn Forsman
cc9ab5a0d8 Add support for manylinux_${GLIBCMAJOR}_${GLIBCMINOR} wheels 
https://www.python.org/dev/peps/pep-0600/

This fixes e.g. using the latest tokenizers package (0.10.3) with
mach-nix.

TODO: Update WheelDependencyProvider to process all filename tags
individually instead of matching them all with a single regexp. If it
had done that already, this change would have been somewhat unneeded, as
all wheel files seem to be doubly tagged (at least for now):

* manylinux_2_5 is also tagged manylinux1
* manylinux_2_12 is also tagged manylinux2010
* manylinux_2_17 is also tagged manylinux2014

(But since the new format is first in the filename, the old regexps
don't match.)
 2021-07-04 11:33:19 +02:00
DavHau
e4685e2aec Merge remote-tracking branch 'mschwaig/fix-outdated-error-message' 2021-06-10 16:19:41 +07:00
DavHau
ca166a5062 revert references to 'conda-beta' 2021-06-10 15:04:19 +07:00
DavHau
27491cdf25 revert default providers to 'wheel,sdist,nixpkgs' 2021-06-10 00:07:19 +07:00
DavHau
cb002d307c fix: improper recursive dependency cleaning when overriding nixpkgs 2021-06-09 21:54:45 +07:00
DavHau
0d12c798d2 fix test-all flake app 2021-06-09 21:54:45 +07:00
DavHau
f18ed3bd78 fix mach-nix package 2021-06-09 16:21:31 +07:00
DavHau
5d6c89d9c5 fix: don't apply fix tensorflow.rm-tensorboard when provider == conda 2021-06-09 15:11:06 +07:00
DavHau
af3f9ed6e2 fix: recursive dependency cleaning not applied on all kinds of inputs 2021-06-09 15:09:52 +07:00
DavHau
2535798e10 update auto-patchelf.sh 2021-06-09 14:01:47 +07:00
DavHau
c76e162b4d add flake apps for testing 2021-06-09 13:11:17 +07:00
DavHau
17c0c9d390 fix: requirements parsing 2021-06-09 13:10:33 +07:00
DavHau
4ca6b393b2 add parameter 'condaVersion' + support conda virtual packages 2021-06-08 19:19:56 +07:00
DavHau
7cc60c1292 fix: various bug fixes 2021-06-08 19:18:13 +07:00
DavHau
573bfe16e8 update conda channels 2021-06-08 19:16:14 +07:00
DavHau
31a8867249 package-fix: libwebp-base - remove colliding binaries in conda package 2021-06-08 19:14:53 +07:00
DavHau
37ceae438d update flake lock 2021-06-08 19:13:27 +07:00
DavHau
06bda013a3 fix: removed circular deps missing in autoPatchelf 2021-06-08 19:10:15 +07:00
DavHau
65ea580168 improve requirements parsing 2021-06-06 14:57:04 +07:00
DavHau
c455ed8c56 Merge branch 'master' into conda-beta 2021-05-23 16:22:02 +07:00
DavHau
8c908fcde6 fix changelog wording 2021-05-23 14:30:15 +07:00
DavHau
40e1302842 version 3.3.0 (final) 2021-05-23 14:25:48 +07:00
DavHau
56c2738780 fix deps-db-and-fetcher.nix 2021-05-23 14:14:33 +07:00
DavHau
a9541433a5 refactor deps-db-and-fetcher 2021-05-23 14:01:06 +07:00
DavHau
0003c4d750 fix version file 2021-05-23 13:58:02 +07:00
DavHau
46f7940ded update python to 3.8 2021-05-23 13:05:16 +07:00
DavHau
038f820668 switch to nixos-unstable 2021-05-23 13:00:23 +07:00
DavHau
f7fbf74ee0 improve: simplified override interface dealt badly with empty and null values 2021-05-23 12:35:08 +07:00
DavHau
ca8a65d434 switch to nixpkgs-20.09 2021-05-23 12:03:11 +07:00
DavHau
8eed287656 bump nixpkgs and pypi-deps-db 2021-05-22 22:25:59 +07:00