Commit graph

205 commits

Author SHA1 Message Date
adisbladis
fbb246c77a
poetry: 1.0.3 -> 1.0.4 2020-02-28 20:22:42 +00:00
adisbladis
090e2dd957
Add fixup hook
This hook should fix common mistakes like installing `tests` in
site-packages which leads to collisions.
2020-02-28 19:45:23 +00:00
adisbladis
c1b21de0ba
Check if pyproject.toml exists before patching path deps
Local path dependencies may be setuptools projects.
2020-02-28 19:27:33 +00:00
adisbladis
29a3282aef
tests: Create callTest function 2020-02-28 14:01:51 +00:00
adisbladis
1f413d27c9
Implement a proper fix for #52
We need to check pyproject.toml & poetry.lock constraints
_separately_.

Consider the following scenario:

- `poetry` depends on `tox` which in turn depends on `virtualenv`.

- `poetry` _also_ depends directly on virtualenv, but only for older
python versions.

In this case we don't want `virtualenv` as a direct input to `poetry`
but we _do_ want it as an input for `tox`.
2020-02-28 14:01:46 +00:00
adisbladis
7f7499462f
Set meta.platforms to something reasonable by default 2020-02-28 08:38:36 +00:00
adisbladis
d053ef9922
poetry: Remove hacky build steps
Poetry can now be built normally.
2020-02-28 08:28:20 +00:00
adisbladis
e570b38501
Merge pull request #67 from nix-community/canonical-pytest-runner
Use canonical pytest-runner name
2020-02-27 17:54:46 +00:00
adisbladis
0230976086
overrides: Don't run tests for pytest
This will reduce closure size when we need to pick pytest from nixpkgs
2020-02-27 17:45:56 +00:00
adisbladis
080600ef6a
overrides: Use canonical pytest-runner name 2020-02-27 17:45:50 +00:00
Tobias Pflug
5db723df57
Merge pull request #66 from nix-community/add-pytest-runner
Add pytest-runner where needed
2020-02-27 17:41:01 +01:00
Tobias Pflug
7f32c6d559 Add pytest-runner where needed
Instead of patching around in setup.py which isn't very reliable at
all add pytest-runner to propagatedBuildInputs where necessary and
set `doCheck=false`.
2020-02-27 17:22:45 +01:00
adisbladis
99f885eb77
Merge pull request #64 from nix-community/tables-override
Add tables override
2020-02-27 10:28:53 +00:00
Tobias Pflug
fc349fc67e Add tables override 2020-02-27 11:10:51 +01:00
Tobias Pflug
e80f0acd83
Merge pull request #63 from nix-community/flamegraphs
Add development tool to generate flame graphs for nix-instantiate
2020-02-27 10:21:25 +01:00
adisbladis
e50b9c96db
Add flamegraph artifacts to CI 2020-02-27 08:58:12 +00:00
adisbladis
ccf5654e3c
Add .envrc for direnv 2020-02-27 08:44:43 +00:00
adisbladis
8336c5f8c6
Add development tools to generate flame graphs for nix-instantiate 2020-02-27 08:44:42 +00:00
adisbladis
6fc16e0dee
Use overlay in shell.nix 2020-02-27 08:44:38 +00:00
adisbladis
8d8d2cf050
Merge pull request #62 from Infinisil/more-overrides
Add overrides for fancycompleter and pylint
2020-02-26 18:33:26 +00:00
Silvan Mosberger
bcd9af9cfe
Add overrides for fancycompleter and pylint 2020-02-26 18:55:41 +01:00
Tobias Pflug
618fca619b
Merge pull request #58 from nix-community/add-overrides
Add more overrides
2020-02-26 15:43:08 +01:00
Tobias Pflug
df5744ebf0 Add more overrides
This adds overrides for the following python packages
- astroid
- h5py
- jupyter
- openexr
- rockset
- tensorpack
2020-02-26 15:25:07 +01:00
adisbladis
ca2c6fffc4
Merge pull request #56 from nix-community/readme-updates
Provide API documentation in README
2020-02-26 09:32:13 +00:00
Tobias Pflug
47d9dfa46a Provide API documentation in README
This provides a more complete API documetnation covering the public
interface of poetry2nix
2020-02-26 10:15:49 +01:00
Tobias Pflug
e731e88a74
Merge pull request #57 from nix-community/drop-meta
Drop `meta` attribute for mkPoetryPackages/mkPoetryEnv
2020-02-26 09:31:57 +01:00
Tobias Pflug
e1e3b90be2 Drop meta attribute for mkPoetryPackages/mkPoetryEnv
The `meta` attribute is only relevant for `mkPoetryApplication`
and can safely be dropped elsewhere.
2020-02-26 09:24:23 +01:00
adisbladis
9dae5620ea
Add projectDir parameter
Turns
```
poetry2nix.mkPoetryEnv {
    pyproject = ./pyproject.toml;
    poetrylock = ./poetry.lock;
    pwd = ./.;
    python = python3;
}
```

into
```
poetry2nix.mkPoetryEnv {
    projectDir = ./.;
    python = python3;
}
```
2020-02-25 14:40:36 +00:00
adisbladis
e416555959
Merge pull request #55 from nix-community/poetry2nix-overrides
Provide withDefaults and withoutDefaults
2020-02-25 13:43:14 +00:00
Tobias Pflug
b3870576f8 Provide withDefaults and withoutDefaults
This adds the convenience functions withDefaults and
withoutDefaults which simply wrap the provided argument in a list
either with or without the default poetry overrides.

Tests have also been adapted to make use of `withDefaults` where
appropriate.
2020-02-25 14:24:48 +01:00
adisbladis
c2b85f104a
Remove rec keyword from override 2020-02-25 10:05:51 +00:00
adisbladis
f4110f181a
Remove poetryPkg argument from public APIs 2020-02-25 10:01:42 +00:00
adisbladis
007b726331
Add pyzmq override 2020-02-25 10:01:38 +00:00
adisbladis
cb214f8327
fix overrides formatting 2020-02-24 18:49:12 +00:00
adisbladis
2848db5993
overrides: Add pandas cython override 2020-02-24 17:34:57 +00:00
adisbladis
5691ea49bd
Bump poetry2nix version number to 1.5.0 2020-02-24 12:42:20 +00:00
adisbladis
5d902c8bab
Slightly improve evaluation performance 2020-02-24 12:41:42 +00:00
adisbladis
35d38a1b11
Merge pull request #53 from utdemir/expose-mkPoetryPython
Expose mkPoetryPackages
2020-02-24 12:39:53 +00:00
Utku Demir
f4b70664c2
Expose mkPoetryPackages 2020-02-24 12:38:15 +00:00
adisbladis
c88211d081
Merge pull request #52 from nix-community/pyproject-python-version
Add support for python version constraints from pyproject.toml
2020-02-24 12:35:33 +00:00
adisbladis
4d9bee6f81
Refactor mkPoetryPython (mkPoetryPackages)
- Renamed mkPoetryPython to mkPoetryPackages as it's more descriptive
We intend to expose this function soon so a better name is in order.

- Put TOML parsing inside mkPoetryPackages to unify parsing and avoid double parsing.
2020-02-24 12:25:55 +00:00
adisbladis
dc88082f58
Add support for python version constraints from pyproject.toml
Pep508 markers alone are not always enough, see #50

This sadly introduces a minor breakage in `mkPoetryEnv`.
2020-02-24 12:25:51 +00:00
adisbladis
64f7a11c03
Merge pull request #51 from nix-community/toml-path-deps-hook
Convert TOML path dependency filtering to a setup hook
2020-02-23 15:56:27 +01:00
adisbladis
1c3ab5388a
Comment pypy tests
Pypy seems to have had some recent nixpkgs breakage unrelated to poetry2nix
2020-02-23 14:37:01 +00:00
adisbladis
0367b93492
Turn pyproject.toml patching into a hook
We should not be setting pre/post phases as it's counter intuitive
when working with overrides.
2020-02-23 14:37:01 +00:00
adisbladis
fc6c640a12
Merge pull request #49 from purcell/two-level-path-deps
Handle two-layer inclusion of "path" dependencies
2020-02-23 15:36:50 +01:00
Steve Purcell
71cdd20018 Remove "path" dependencies in indirectly referenced packages 2020-02-18 15:58:31 +13:00
Steve Purcell
b013b7a1c9 Add failing test for two-layer inclusion of "path" dependencies 2020-02-18 15:58:17 +13:00
adisbladis
cdb1bd83a3
poetry: 1.0.2 -> 1.0.3 2020-02-01 21:56:43 +00:00
adisbladis
8504e52c27
fmt fixup 2020-01-28 20:04:44 +00:00