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

461 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Prince
2d2f50cb2a Upgrade resolvelib to 0.4.0. 2021-10-15 15:46:46 -06:00
Tom Prince
dad6d3948e Track raw provider version, rather than rebuilding. 2021-10-15 15:01:41 -06: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
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
DavHau
d223656fc0
Merge pull request #308 from fiksn/master 
Remove trailing slash in mach-nix git url
 2021-08-20 15:57:21 +03:00
Gregor Pogacnik
19fcc8ebf3 Remove trailing slash in mach-nix url 2021-07-23 15:04:15 +02:00
DavHau
d884751a1c
Merge pull request #301 from bjornfor/support-pep-600-manylinux-tags 
Add support for manylinux_${GLIBCMAJOR}_${GLIBCMINOR} wheels
 2021-07-08 13:46:18 +02: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
0171afc492
Merge pull request #296 from drewrisinger/patch-1 
README: refs/heads/{version} -> refs/tags/
 2021-06-23 07:53:33 +07:00
Drew
fc97b7f604
README: refs/heads/{version} -> refs/tags/ 
The README example didn't work, due to an incorrect git ref.
It now works with this commit.
 2021-06-22 14:17:01 -04:00
DavHau
77fc01c0e1
Merge pull request #286 from HaoZeke/patch-1 
examples: Fix minor typo preventing use
 2021-06-11 03:47:02 +07:00
Rohit Goswami
7621843b0e
examples: Fix minor typo preventing use 2021-06-10 16:08:25 +00:00
DavHau
e4685e2aec Merge remote-tracking branch 'mschwaig/fix-outdated-error-message' 2021-06-10 16:19:41 +07:00
DavHau
a14ded8e50
Merge pull request #285 from DavHau/conda-beta 
Conda provider and parser
 2021-06-10 16:09:39 +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
f8b1f5f107 use nix-portable for CI 2021-06-09 21:54:45 +07:00