Commit graph

1473 commits

Author SHA1 Message Date
adisbladis
cec428df49
Release 1.6.1 2020-03-27 14:33:15 +00:00
adisbladis
78463ac06e
overrides: Add toml to zipp override 2020-03-26 19:07:17 +00:00
adisbladis
f7e435407e
nixpkgs-fmt all the things (again...) 2020-03-14 23:13:51 +00:00
adisbladis
e2a47bc8cb
Merge pull request #72 from smarkets/master
Do not leak projectDir into expressions
2020-03-12 13:09:30 +00:00
Oleh Stolyar
a3655babd4 Do not leak projectDir into expressions
Fixes caching issues.
2020-03-12 13:06:06 +00:00
adisbladis
a7fec487f8
Prevent infinite recursion in gitignore filter construction 2020-03-01 08:45:52 +00:00
adisbladis
6f5d96a5fa
poetry: 1.0.4 -> 1.0.5 2020-02-29 22:09:44 +00:00
adisbladis
81a24d4d19
Fix README formatting 2020-02-29 22:06:11 +00:00
adisbladis
b81a94878f
nixpkgs-fmt lib.nix 2020-02-29 21:27:38 +00:00
adisbladis
924746ff9a
Make gitignore recursive 2020-02-29 21:22:34 +00:00
adisbladis
753c7965dc
Add flamegraph to gitignore 2020-02-29 14:09:40 +00:00
adisbladis
06d9687c0f
Prepare for release 1.6.0 2020-02-29 14:07:31 +00:00
adisbladis
2e55b2e95a
Remove the doc attribute
It was never really used by anything and it's output is not really
useful at this moment.
2020-02-29 14:07:28 +00:00
adisbladis
5ff062b7a9
Remove flake.lock 2020-02-29 12:54:31 +00:00
adisbladis
75cd7de7b0
Merge pull request #61 from nix-community/default-src
Set `src` to `cleanPythonSources projectDir` by default
2020-02-29 12:27:12 +00:00
adisbladis
bb3c2d57d5
Add a default source filter when projectDir is used
Also use the same source filter for path deps.

The default source filter currently filters:
- Filters gitignore (if it exists, non-recursive)
- Filters pycache/pyc files
- Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks
2020-02-29 12:05:23 +00:00
adisbladis
4e48f6c851
Clarify that attrs passed to mkPoetryApplication are passed through to buildPythonApplication 2020-02-29 12:04:36 +00:00
adisbladis
b85e2a6733
Set src to lib.cleanSource projectDir by default
Ideally we'd use `nix-gitignore` but that one fails when there is no
`.gitignore` file so it's not a sensible default.
2020-02-29 12:04:36 +00:00
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