fpm 1.7.0 → 1.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.rst +7 -0
- data/lib/fpm/package/cpan.rb +7 -8
- data/lib/fpm/package/virtualenv.rb +20 -1
- data/lib/fpm/version.rb +1 -1
- metadata +2 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e83b02439330a08aecf2eccc09088636385bcd32
|
4
|
+
data.tar.gz: ea88fac823151665fd45183cfeb0324635e25ae4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4f3d69a8f1331c530720feccfa22549baa05e3ee0de6424c81f348fa78168116a730688c6c4b8fbaf477a9b0c3d8ce16b325fbb646b75880ad6d4b397279932a
|
7
|
+
data.tar.gz: 0d40b1dd3c676391e773a3e8af16cf4bd0649826aa2ce9adfb1402f4a0c3761c34ce3c8e849d1b8ec8daf409f34313d2ce5ca6d0338171ecea67c63bf046b189
|
data/CHANGELOG.rst
CHANGED
@@ -1,6 +1,13 @@
|
|
1
1
|
Release Notes and Change Log
|
2
2
|
============================
|
3
3
|
|
4
|
+
1.8.0 (December 28, 2016)
|
5
|
+
^^^^^^^^^^^^^^^^^^^^^^^^^
|
6
|
+
* virtualenv: Add `--virtualenv-setup-install` flag to run `setup.py install` after pip finishes installing things. (`#1218`_; John Stowers)
|
7
|
+
* virtualenv: Add `--virtualenv-system-site-package` flag which creates the virtualenv in a way that allows it to use the system python packages. (`#1218`_; John Stowers)
|
8
|
+
* cpan: Fix bug preventing some perl modules from being installed (`#1236`_, `#1241`_; Richard Grainger)
|
9
|
+
* rpm: Documentation improvements (`#1242`_; Nick Griffiths)
|
10
|
+
|
4
11
|
1.7.0 (November 28, 2016)
|
5
12
|
^^^^^^^^^^^^^^^^^^^^^^^^^
|
6
13
|
* virtualenv: Fix a bug where `pip` might be run incorrectly (`#1210`_; Nico Griffiths)
|
data/lib/fpm/package/cpan.rb
CHANGED
@@ -309,17 +309,16 @@ class FPM::Package::CPAN < FPM::Package
|
|
309
309
|
:distribution => distribution,
|
310
310
|
:version => cpan_version)
|
311
311
|
|
312
|
-
# default to latest
|
312
|
+
# default to latest version unless we specify one
|
313
313
|
if cpan_version.nil?
|
314
|
-
self.version = metadata["version"]
|
314
|
+
self.version = "#{metadata["version"]}"
|
315
315
|
else
|
316
|
-
|
317
|
-
self.version = "v#{cpan_version}"
|
318
|
-
else
|
319
|
-
self.version = cpan_version
|
320
|
-
end
|
316
|
+
self.version = "#{cpan_version}"
|
321
317
|
end
|
322
|
-
|
318
|
+
|
319
|
+
# remove 'v' prefix from version if it is there
|
320
|
+
self.version.sub!(/^v/, '')
|
321
|
+
|
323
322
|
# Search metacpan to get download URL for this version of the module
|
324
323
|
metacpan_search_url = "http://api.metacpan.org/v0/release/_search"
|
325
324
|
metacpan_search_query = '{"query":{"match_all":{}},"filter":{"term":{"release.name":"' + "#{distribution}-#{self.version}" + '"}}}'
|
@@ -30,6 +30,13 @@ class FPM::Package::Virtualenv < FPM::Package
|
|
30
30
|
:multivalued => true, :attribute_name => :virtualenv_pypi_extra_index_urls,
|
31
31
|
:default => nil
|
32
32
|
|
33
|
+
option "--setup-install", :flag, "After building virtualenv run setup.py install "\
|
34
|
+
"useful when building a virtualenv for packages and including their requirements from "
|
35
|
+
"requirements.txt"
|
36
|
+
|
37
|
+
option "--system-site-packages", :flag, "Give the virtual environment access to the "\
|
38
|
+
"global site-packages"
|
39
|
+
|
33
40
|
private
|
34
41
|
|
35
42
|
# Input a package.
|
@@ -77,7 +84,13 @@ class FPM::Package::Virtualenv < FPM::Package
|
|
77
84
|
|
78
85
|
::FileUtils.mkdir_p(virtualenv_build_folder)
|
79
86
|
|
80
|
-
|
87
|
+
if self.attributes[:virtualenv_system_site_packages?]
|
88
|
+
logger.info("Creating virtualenv with --system-site-packages")
|
89
|
+
safesystem("virtualenv", "--system-site-packages", virtualenv_build_folder)
|
90
|
+
else
|
91
|
+
safesystem("virtualenv", virtualenv_build_folder)
|
92
|
+
end
|
93
|
+
|
81
94
|
pip_exe = File.join(virtualenv_build_folder, "bin", "pip")
|
82
95
|
python_exe = File.join(virtualenv_build_folder, "bin", "python")
|
83
96
|
|
@@ -104,6 +117,12 @@ class FPM::Package::Virtualenv < FPM::Package
|
|
104
117
|
pip_args = [python_exe, pip_exe, "install", "-i", attributes[:virtualenv_pypi]] << extra_index_url_args << target_args
|
105
118
|
safesystem(*pip_args.flatten)
|
106
119
|
|
120
|
+
if attributes[:virtualenv_setup_install?]
|
121
|
+
logger.info("Running PACKAGE setup.py")
|
122
|
+
setup_args = [python_exe, "setup.py", "install"]
|
123
|
+
safesystem(*setup_args.flatten)
|
124
|
+
end
|
125
|
+
|
107
126
|
if ! is_requirements_file && package_version.nil?
|
108
127
|
frozen = safesystemout(python_exe, pip_exe, "freeze")
|
109
128
|
frozen_version = frozen[/#{package}==[^=]+$/]
|
data/lib/fpm/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fpm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jordan Sissel
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-12-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: json
|
@@ -320,4 +320,3 @@ signing_key:
|
|
320
320
|
specification_version: 4
|
321
321
|
summary: fpm - package building and mangling
|
322
322
|
test_files: []
|
323
|
-
has_rdoc:
|