Merge pull request #254 from ijl/py2-tag

Fix non-interpreter-specific wheels using tag with py2

src/build_context.rs

@@ -112,15 +112,15 @@ type BuiltWheelMetadata = (PathBuf, String, Option<PythonInterpreter>);
 
 impl BuildContext {
     /// Checks which kind of bindings we have (pyo3/rust-cypthon or cffi or bin) and calls the
-    /// correct builder. Returns a Vec that contains location, python tag (e.g. py2.py3 or cp35)
+    /// correct builder. Returns a Vec that contains location, python tag (e.g. py3 or cp35)
     /// and for bindings the python interpreter they bind against.
     pub fn build_wheels(&self) -> Result<Vec<BuiltWheelMetadata>, Error> {
         fs::create_dir_all(&self.out)
             .context("Failed to create the target directory for the wheels")?;
 
         let wheels = match &self.bridge {
-            BridgeModel::Cffi => vec![(self.build_cffi_wheel()?, "py2.py3".to_string(), None)],
-            BridgeModel::Bin => vec![(self.build_bin_wheel()?, "py2.py3".to_string(), None)],
+            BridgeModel::Cffi => vec![(self.build_cffi_wheel()?, "py3".to_string(), None)],
+            BridgeModel::Bin => vec![(self.build_bin_wheel()?, "py3".to_string(), None)],
             BridgeModel::Bindings(_) => self.build_binding_wheels()?,
         };
 

src/python_interpreter.rs

@@ -61,7 +61,6 @@ fn windows_interpreter_no_build(
 /// Installed Pythons found by py Launcher for Windows
 /// -3.7-64 *
 /// -3.6-32
-/// -2.7-64
 /// ```
 ///
 /// When using `conda` we can use the `conda info -e` command to retrieve information

src/target.rs

@@ -173,9 +173,8 @@ impl Target {
     }
 
     /// Returns the tags for the WHEEL file for cffi wheels
-    pub fn get_py2_and_py3_tags(&self, manylinux: &Manylinux) -> Vec<String> {
+    pub fn get_py3_tags(&self, manylinux: &Manylinux) -> Vec<String> {
         vec![
-            format!("py2-none-{}", self.get_platform_tag(&manylinux)),
             format!("py3-none-{}", self.get_platform_tag(&manylinux)),
         ]
     }
@@ -237,10 +236,10 @@ impl Target {
     /// Returns the tags for the platform without python version
     pub fn get_universal_tags(&self, manylinux: &Manylinux) -> (String, Vec<String>) {
         let tag = format!(
-            "py2.py3-none-{platform}",
+            "py3-none-{platform}",
             platform = self.get_platform_tag(&manylinux)
         );
-        let tags = self.get_py2_and_py3_tags(&manylinux);
+        let tags = self.get_py3_tags(&manylinux);
         (tag, tags)
     }
 }